fixup! Add application manager implementation for WebEngineSupport

7 files changed, 18 insertions, 17 deletions

diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h
index 1e848dadd3..e4cab833e4 100644
--- a/src/components/application_manager/include/application_manager/application_manager_impl.h
+++ b/src/components/application_manager/include/application_manager/application_manager_impl.h
@@ -409,7 +409,7 @@ class ApplicationManagerImpl
 
   void OnWebEngineDeviceCreated() OVERRIDE;
 
-  void CreatePendingApplication(const std::string& policy_app_id) OVERRIDE;
+  void CreatePendingLocalApplication(const std::string& policy_app_id) OVERRIDE;
 
   void RemovePendingApplication(const std::string& policy_app_id) OVERRIDE;
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_set_app_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_set_app_properties_request.cc
index 92bfd640c6..a4c5d6b1b4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_set_app_properties_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_set_app_properties_request.cc
@@ -99,7 +99,7 @@ void BCSetAppPropertiesRequest::Run() {
       AppPropertiesState::ENABLED_FLAG_SWITCH == properties_change_status;
 
   if (app_enabled() && (enable_flag_switch || is_new_app)) {
-    application_manager_.CreatePendingApplication(policy_app_id);
+    application_manager_.CreatePendingLocalApplication(policy_app_id);
     application_manager_.SendUpdateAppList();
     return;
   }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_set_app_properties_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_set_app_properties_request_test.cc
index 67f7246970..5804476649 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_set_app_properties_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_set_app_properties_request_test.cc
@@ -125,7 +125,7 @@ TEST_F(BCSetAppPropertiesRequestTest,
           kSource));
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(notification, kSource))
       .Times(0);
-  EXPECT_CALL(app_mngr_, CreatePendingApplication(kPolicyAppId)).Times(0);
+  EXPECT_CALL(app_mngr_, CreatePendingLocalApplication(kPolicyAppId)).Times(0);
   EXPECT_CALL(app_mngr_, SendUpdateAppList()).Times(0);
 
   ASSERT_TRUE(command->Init());
@@ -166,7 +166,7 @@ TEST_F(BCSetAppPropertiesRequestTest,
               hmi_apis::FunctionID::BasicCommunication_SetAppProperties),
           kSource));
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(notification, kSource));
-  EXPECT_CALL(app_mngr_, CreatePendingApplication(kPolicyAppId)).Times(0);
+  EXPECT_CALL(app_mngr_, CreatePendingLocalApplication(kPolicyAppId)).Times(0);
   EXPECT_CALL(app_mngr_, SendUpdateAppList()).Times(0);
 
   ASSERT_TRUE(command->Init());
@@ -207,7 +207,7 @@ TEST_F(BCSetAppPropertiesRequestTest,
               hmi_apis::FunctionID::BasicCommunication_SetAppProperties),
           kSource));
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(notification, kSource));
-  EXPECT_CALL(app_mngr_, CreatePendingApplication(kPolicyAppId));
+  EXPECT_CALL(app_mngr_, CreatePendingLocalApplication(kPolicyAppId));
   EXPECT_CALL(app_mngr_, SendUpdateAppList());
 
   ASSERT_TRUE(command->Init());
@@ -248,7 +248,7 @@ TEST_F(BCSetAppPropertiesRequestTest,
               hmi_apis::FunctionID::BasicCommunication_SetAppProperties),
           kSource));
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(notification, kSource));
-  EXPECT_CALL(app_mngr_, CreatePendingApplication(kPolicyAppId));
+  EXPECT_CALL(app_mngr_, CreatePendingLocalApplication(kPolicyAppId));
   EXPECT_CALL(app_mngr_, SendUpdateAppList());
 
   ASSERT_TRUE(command->Init());
@@ -289,7 +289,7 @@ TEST_F(BCSetAppPropertiesRequestTest,
               hmi_apis::FunctionID::BasicCommunication_SetAppProperties),
           kSource));
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(notification, kSource));
-  EXPECT_CALL(app_mngr_, CreatePendingApplication(kPolicyAppId)).Times(0);
+  EXPECT_CALL(app_mngr_, CreatePendingLocalApplication(kPolicyAppId)).Times(0);
   EXPECT_CALL(app_mngr_, RemovePendingApplication(kPolicyAppId));
   EXPECT_CALL(app_mngr_, SendUpdateAppList());
 
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 573d3e58a7..99024924a1 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -1243,7 +1243,7 @@ void ApplicationManagerImpl::RemovePendingApplication(
                           << apps_to_register_.size());
 }
 
-void ApplicationManagerImpl::CreatePendingApplication(
+void ApplicationManagerImpl::CreatePendingLocalApplication(
     const std::string& policy_app_id) {
   policy::StringArray nicknames;
   policy::StringArray app_hmi_types;
@@ -1316,7 +1316,7 @@ void ApplicationManagerImpl::OnWebEngineDeviceCreated() {
   }
 
   for (auto policy_app_id : enabled_local_apps) {
-    CreatePendingApplication(policy_app_id);
+    CreatePendingLocalApplication(policy_app_id);
   }
   SendUpdateAppList();
 }
@@ -3222,7 +3222,7 @@ void ApplicationManagerImpl::UnregisterApplication(
       LOG4CXX_DEBUG(logger_,
                     "Enabled local app has been unregistered. Re-create "
                     "pending application");
-      CreatePendingApplication(app_to_remove->policy_app_id());
+      CreatePendingLocalApplication(app_to_remove->policy_app_id());
     }
 
     RefreshCloudAppInformation();
diff --git a/src/components/application_manager/test/application_manager_impl_test.cc b/src/components/application_manager/test/application_manager_impl_test.cc
index 38c43b5dcd..b9bf3aaa99 100644
--- a/src/components/application_manager/test/application_manager_impl_test.cc
+++ b/src/components/application_manager/test/application_manager_impl_test.cc
@@ -323,7 +323,7 @@ class ApplicationManagerImplTest
   void CreatePendingApplication();
 #endif
 
-  void CreatePendingApplication(const std::string& policy_app_id);
+  void CreatePendingLocalApplication(const std::string& policy_app_id);
 
   uint32_t app_id_;
   NiceMock<policy_test::MockPolicySettings> mock_policy_settings_;
@@ -1933,7 +1933,7 @@ TEST_F(ApplicationManagerImplTest, SetIconFileFromSystemRequest_Success) {
 }
 #endif  // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT
 
-void ApplicationManagerImplTest::CreatePendingApplication(
+void ApplicationManagerImplTest::CreatePendingLocalApplication(
     const std::string& policy_app_id) {
   // CreatePendingApplication
   std::vector<std::string> nicknames{"PendingApplication"};
@@ -1948,18 +1948,18 @@ void ApplicationManagerImplTest::CreatePendingApplication(
       .WillOnce(DoAll(SetArgReferee<1>(app_properties), Return(true)));
   // Expect NO Update app list
   EXPECT_CALL(*mock_rpc_service_, ManageHMICommand(_, _)).Times(0);
-  app_manager_impl_->CreatePendingApplication(policy_app_id);
+  app_manager_impl_->CreatePendingLocalApplication(policy_app_id);
   AppsWaitRegistrationSet app_list =
       app_manager_impl_->AppsWaitingForRegistration().GetData();
   EXPECT_EQ(1u, app_list.size());
 }
 
 TEST_F(ApplicationManagerImplTest, CreatePendingApplicationByPolicyAppID) {
-  CreatePendingApplication(kPolicyAppID);
+  CreatePendingLocalApplication(kPolicyAppID);
 }
 
 TEST_F(ApplicationManagerImplTest, RemoveExistingPendingApplication_SUCCESS) {
-  CreatePendingApplication(kPolicyAppID);
+  CreatePendingLocalApplication(kPolicyAppID);
   auto app_list = app_manager_impl_->AppsWaitingForRegistration().GetData();
   ASSERT_EQ(1u, app_list.size());
 
diff --git a/src/components/include/application_manager/application_manager.h b/src/components/include/application_manager/application_manager.h
index eb684e8c69..6527cb960c 100644
--- a/src/components/include/application_manager/application_manager.h
+++ b/src/components/include/application_manager/application_manager.h
@@ -176,7 +176,8 @@ class ApplicationManager {
    * nicknames are not empty
    * @param policy_app_id app id to store
    */
-  virtual void CreatePendingApplication(const std::string& policy_app_id) = 0;
+  virtual void CreatePendingLocalApplication(
+      const std::string& policy_app_id) = 0;
 
   /**
    * @brief RemovePendingApplication Remove applicaiton from pending state
diff --git a/src/components/include/test/application_manager/mock_application_manager.h b/src/components/include/test/application_manager/mock_application_manager.h
index 4b155f12cc..2ab7983b60 100644
--- a/src/components/include/test/application_manager/mock_application_manager.h
+++ b/src/components/include/test/application_manager/mock_application_manager.h
@@ -82,7 +82,7 @@ class MockApplicationManager : public application_manager::ApplicationManager {
       DataAccessor<application_manager::AppsWaitRegistrationSet>());
   MOCK_CONST_METHOD0(reregister_applications,
                      DataAccessor<application_manager::ReregisterWaitList>());
-  MOCK_METHOD1(CreatePendingApplication,
+  MOCK_METHOD1(CreatePendingLocalApplication,
                void(const std::string& policy_app_id));
   MOCK_METHOD1(RemovePendingApplication,
                void(const std::string& policy_app_id));