Merge pull request #236 in NAR/sdl-core from fix/build_errors_in_tests to feature/Ford-WiFi

* commit 'd529b059e47f170c77137ac1edf10c0696a7bb6b':
  fallout from other changes in the Ford-WiFi branch
  revert device_type hacks
  revert device_type hacks
  UT: support newly added Application::deferred_resumption_hmi_level()
  UT: support newly added ApplicationManager::CheckResumptionRequiredTransportAvailable()
  UT: update test cases to support new protocol frames
  UT: fix CheckStringContainer() test case
  UT: fix test case TcpClientListenerTest IsInitialised
  UT: support newly added TransportAdapter::GetDeviceType()
  UT: support newly added transport_manager_tcp_adapter_network_interface() method
  Remove invalid test cases
  Add/fix mock methods for testing
  Update test code to add new arg in Connection::AddNewSession() and AddNewService()
  Update test code related to SessionContext struct
  Update test codes related to SendEndService()
  Update DeviceInfo struct in test codes
  Add mock methods for testing

1 files changed, 2 insertions, 2 deletions

diff --git a/src/components/application_manager/test/include/application_manager/mock_application.h b/src/components/application_manager/test/include/application_manager/mock_application.h
index ec707c7a76..5bb41181fe 100644
--- a/src/components/application_manager/test/include/application_manager/mock_application.h
+++ b/src/components/application_manager/test/include/application_manager/mock_application.h
@@ -139,9 +139,9 @@ class MockApplication : public ::application_manager::Application {
   MOCK_METHOD1(set_is_resuming, void(bool));
   MOCK_CONST_METHOD0(is_resuming, bool());
   MOCK_METHOD1(set_deferred_resumption_hmi_level,
-               void(mobile_api::HMILevel::eType level));
+               void(application_manager::mobile_api::HMILevel::eType level));
   MOCK_CONST_METHOD0(deferred_resumption_hmi_level,
-                     mobile_api::HMILevel::eType());
+                     application_manager::mobile_api::HMILevel::eType());
   MOCK_METHOD1(AddFile, bool(const ::application_manager::AppFile& file));
   MOCK_CONST_METHOD0(getAppFiles, const ::application_manager::AppFilesMap&());
   MOCK_METHOD1(UpdateFile, bool(const ::application_manager::AppFile& file));