Revert "Update based on comments"

This reverts commit d67a37a5dedfe696dd4308fd0eb53ee48e15daf8.

# Conflicts:
#	src/components/application_manager/src/application_manager_impl.cc
#	src/components/connection_handler/src/connection_handler_impl.cc

5 files changed, 12 insertions, 6 deletions

diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 7b2475a4e0..b4381f4ba9 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -845,7 +845,8 @@ void ApplicationManagerImpl::RefreshCloudAppInformation() {
     }
 
     // If the device was disconnected, this will reinitialize the device
-    connection_handler().AddCloudAppDevice(endpoint, cloud_transport_type);
+    connection_handler().AddCloudAppDevice(
+        *enabled_it, endpoint, cloud_transport_type);
   }
   pending_device_map_lock_ptr_->Release();
 
diff --git a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h
index 96cb9f600d..e9e7ba47a3 100644
--- a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h
+++ b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h
@@ -130,7 +130,8 @@ class ConnectionHandlerImpl
 
   void ConnectToAllDevices() OVERRIDE;
 
-  void AddCloudAppDevice(const std::string& endpoint,
+  void AddCloudAppDevice(const std::string& policy_app_id,
+                         const std::string& endpoint,
                          const std::string& cloud_transport_type) OVERRIDE;
 
   void RemoveCloudAppDevice(const DeviceHandle device_id) OVERRIDE;
diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc
index b58700834f..41d6e1dd54 100644
--- a/src/components/connection_handler/src/connection_handler_impl.cc
+++ b/src/components/connection_handler/src/connection_handler_impl.cc
@@ -1327,7 +1327,9 @@ void ConnectionHandlerImpl::ConnectToAllDevices() {
 }
 
 void ConnectionHandlerImpl::AddCloudAppDevice(
-    const std::string& endpoint, const std::string& cloud_transport_type) {
+    const std::string& policy_app_id,
+    const std::string& endpoint,
+    const std::string& cloud_transport_type) {
   transport_manager_.AddCloudDevice(endpoint, cloud_transport_type);
 }
 
diff --git a/src/components/include/connection_handler/connection_handler.h b/src/components/include/connection_handler/connection_handler.h
index e409460a96..a4058c7078 100644
--- a/src/components/include/connection_handler/connection_handler.h
+++ b/src/components/include/connection_handler/connection_handler.h
@@ -103,7 +103,8 @@ class ConnectionHandler {
 
   virtual void ConnectToAllDevices() = 0;
 
-  virtual void AddCloudAppDevice(const std::string& endpoint,
+  virtual void AddCloudAppDevice(const std::string& policy_app_id,
+                                 const std::string& endpoint,
                                  const std::string& cloud_transport_type) = 0;
 
   virtual void RemoveCloudAppDevice(const DeviceHandle device_id) = 0;
diff --git a/src/components/include/test/connection_handler/mock_connection_handler.h b/src/components/include/test/connection_handler/mock_connection_handler.h
index 5aed5da58c..219ee7b561 100644
--- a/src/components/include/test/connection_handler/mock_connection_handler.h
+++ b/src/components/include/test/connection_handler/mock_connection_handler.h
@@ -66,8 +66,9 @@ class MockConnectionHandler : public connection_handler::ConnectionHandler {
   MOCK_CONST_METHOD2(RunAppOnDevice,
                      void(const std::string&, const std::string&));
   MOCK_METHOD0(ConnectToAllDevices, void());
-  MOCK_METHOD2(AddCloudAppDevice,
-               void(const std::string& endpoint,
+  MOCK_METHOD3(AddCloudAppDevice,
+               void(const std::string& policy_app_id,
+                    const std::string& endpoint,
                     const std::string& cloud_transport_type));
   MOCK_METHOD1(RemoveCloudAppDevice, void(const DeviceHandle device_id));
   MOCK_METHOD1(CloseRevokedConnection, void(uint32_t connection_key));