Fixes coding style

29 files changed, 187 insertions, 172 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 280617c25f..89ed149add 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
@@ -896,8 +896,9 @@ class ApplicationManagerImpl
    * @param device_from device params being switched to the new transport
    * @param device_to device params on the new transport
    */
-  void OnDeviceSwitchingStart(const connection_handler::Device& device_from,
-                              const connection_handler::Device& device_to) FINAL;
+  void OnDeviceSwitchingStart(
+      const connection_handler::Device& device_from,
+      const connection_handler::Device& device_to) FINAL;
 
   /**
    * @brief OnDeviceSwitchingFinish is invoked on device trasport switching end
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h b/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h
index 3e5f9252de..5713e2e814 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h
@@ -88,8 +88,11 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl {
    * @brief The AppicationType enum defines whether application is newly
    * registered or existing and being switched over another transport
    */
-  enum class ApplicationType { 
-    kNewApplication, kSwitchedApplicationHashOk, kSwitchedApplicationWrongHashId };
+  enum class ApplicationType {
+    kNewApplication,
+    kSwitchedApplicationHashOk,
+    kSwitchedApplicationWrongHashId
+  };
 
   /**
    * @brief Prepares and sends RegisterAppInterface response to mobile
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index dff27cf7f1..ce5c0818f1 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -536,7 +536,7 @@ class PolicyHandler : public PolicyHandlerInterface,
   /**
    * @brief OnDeviceSwitching Notifies policy manager on device switch event so
    * policy permissions should be processed accordingly
-   * @param device_id_from Id of device being switched 
+   * @param device_id_from Id of device being switched
    * @param device_id_to Id of device on the new transport
    */
   void OnDeviceSwitching(const std::string& device_id_from,
diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc
index fcdbc25a3e..eaf097d43f 100644
--- a/src/components/application_manager/src/application_impl.cc
+++ b/src/components/application_manager/src/application_impl.cc
@@ -79,7 +79,7 @@ namespace application_manager {
 
 void SwitchApplicationParameters(ApplicationSharedPtr app,
                                  const uint32_t app_id,
-                                 const size_t device_id, 
+                                 const size_t device_id,
                                  const std::string& mac_address) {
   utils::SharedPtr<ApplicationImpl> application =
       ApplicationSharedPtr::dynamic_pointer_cast<ApplicationImpl>(app);
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index b6ffc80ed4..d42d6d91b2 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -1079,19 +1079,19 @@ void ApplicationManagerImpl::OnDeviceSwitchingStart(
   {
     auto apps_data_accessor = applications();
 
-    std::copy_if(
-          apps_data_accessor.GetData().begin(),
-          apps_data_accessor.GetData().end(),
-          std::back_inserter(reregister_wait_list_),
-          std::bind1st(std::ptr_fun(&device_id_comparator),
-                       device_from.mac_address()));
+    std::copy_if(apps_data_accessor.GetData().begin(),
+                 apps_data_accessor.GetData().end(),
+                 std::back_inserter(reregister_wait_list_),
+                 std::bind1st(std::ptr_fun(&device_id_comparator),
+                              device_from.mac_address()));
   }
 
   {
     // During sending of UpdateDeviceList this lock is acquired also so making
     // it scoped
     sync_primitives::AutoLock lock(reregister_wait_list_lock_);
-    for (auto i = reregister_wait_list_.begin(); reregister_wait_list_.end() != i;
+    for (auto i = reregister_wait_list_.begin();
+         reregister_wait_list_.end() != i;
          ++i) {
       auto app = *i;
       request_ctrl_.terminateAppRequests(app->app_id());
@@ -1101,10 +1101,10 @@ void ApplicationManagerImpl::OnDeviceSwitchingStart(
 
   policy_handler_->OnDeviceSwitching(device_from.mac_address(),
                                      device_to.mac_address());
-  
+
   connection_handler::DeviceMap device_list;
   device_list.insert(std::make_pair(device_to.device_handle(), device_to));
-  
+
   smart_objects::SmartObjectSPtr msg_params =
       MessageHelper::CreateDeviceListSO(device_list, GetPolicyHandler(), *this);
   if (!msg_params) {
@@ -1136,7 +1136,7 @@ void ApplicationManagerImpl::OnDeviceSwitchingFinish(
   for (auto app_it = reregister_wait_list_.begin();
        app_it != reregister_wait_list_.end();
        ++app_it) {
-    auto app = *app_it;    
+    auto app = *app_it;
     UnregisterApplication(app->app_id(),
                           mobile_apis::Result::INVALID_ENUM,
                           is_resuming,
@@ -1147,9 +1147,9 @@ void ApplicationManagerImpl::OnDeviceSwitchingFinish(
 
 void ApplicationManagerImpl::SwitchApplication(ApplicationSharedPtr app,
                                                const uint32_t connection_key,
-                                               const size_t device_id, 
+                                               const size_t device_id,
                                                const std::string& mac_address) {
-   LOG4CXX_AUTO_TRACE(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock lock(applications_list_lock_);
   DCHECK_OR_RETURN_VOID(1 == applications_.erase(app));
 
@@ -1862,9 +1862,8 @@ bool ApplicationManagerImpl::ManageMobileCommand(
 
   auto app_ptr = application(connection_key);
   if (app_ptr && IsAppInReconnectMode(app_ptr->policy_app_id())) {
-    commands_holder_->Suspend(app_ptr,
-                              CommandHolder::CommandType::kMobileCommand,
-                              message);
+    commands_holder_->Suspend(
+        app_ptr, CommandHolder::CommandType::kMobileCommand, message);
     return true;
   }
 
@@ -2101,9 +2100,8 @@ bool ApplicationManagerImpl::ManageHMICommand(
 
     auto app = application(static_cast<uint32_t>(connection_key));
     if (app && IsAppInReconnectMode(app->policy_app_id())) {
-      commands_holder_->Suspend(app,
-                                CommandHolder::CommandType::kHmiCommand,
-                                message);
+      commands_holder_->Suspend(
+          app, CommandHolder::CommandType::kHmiCommand, message);
       return true;
     }
   }
diff --git a/src/components/application_manager/src/command_holder_impl.cc b/src/components/application_manager/src/command_holder_impl.cc
index d5700f512e..82ba486913 100644
--- a/src/components/application_manager/src/command_holder_impl.cc
+++ b/src/components/application_manager/src/command_holder_impl.cc
@@ -45,26 +45,28 @@ void CommandHolderImpl::Suspend(
     CommandType type,
     utils::SharedPtr<smart_objects::SmartObject> command) {
   LOG4CXX_AUTO_TRACE(logger_);
-  LOG4CXX_DEBUG(logger_, "Suspending command(s) for application: "
-                << application->policy_app_id());
+  LOG4CXX_DEBUG(logger_,
+                "Suspending command(s) for application: "
+                    << application->policy_app_id());
   sync_primitives::AutoLock lock(commands_lock_);
 
   if (CommandType::kHmiCommand == type) {
     app_hmi_commands_[application].push_back(command);
-    LOG4CXX_DEBUG(logger_, "Suspended HMI command(s): "
-                  << app_hmi_commands_.size());
+    LOG4CXX_DEBUG(logger_,
+                  "Suspended HMI command(s): " << app_hmi_commands_.size());
   } else {
     app_mobile_commands_[application].push_back(command);
-    LOG4CXX_DEBUG(logger_, "Suspended mobile command(s): "
-                  << app_hmi_commands_.size());
+    LOG4CXX_DEBUG(logger_,
+                  "Suspended mobile command(s): " << app_hmi_commands_.size());
   }
 }
 
 void CommandHolderImpl::Resume(ApplicationSharedPtr application,
                                CommandType type) {
   LOG4CXX_AUTO_TRACE(logger_);
-  LOG4CXX_DEBUG(logger_, "Resuming command(s) for application: "
-                << application->policy_app_id());
+  LOG4CXX_DEBUG(
+      logger_,
+      "Resuming command(s) for application: " << application->policy_app_id());
   if (CommandType::kHmiCommand == type) {
     ResumeHmiCommand(application);
   } else {
@@ -74,20 +76,23 @@ void CommandHolderImpl::Resume(ApplicationSharedPtr application,
 
 void CommandHolderImpl::Clear(ApplicationSharedPtr application) {
   LOG4CXX_AUTO_TRACE(logger_);
-  LOG4CXX_DEBUG(logger_, "Clearing command(s) for application: "
-                << application->policy_app_id());
+  LOG4CXX_DEBUG(
+      logger_,
+      "Clearing command(s) for application: " << application->policy_app_id());
   sync_primitives::AutoLock lock(commands_lock_);
   auto app_hmi_commands = app_hmi_commands_.find(application);
   if (app_hmi_commands_.end() != app_hmi_commands) {
-    LOG4CXX_DEBUG(logger_, "Clearing HMI command(s): "
-                  << app_hmi_commands->second.size());
+    LOG4CXX_DEBUG(
+        logger_,
+        "Clearing HMI command(s): " << app_hmi_commands->second.size());
     app_hmi_commands_.erase(app_hmi_commands);
   }
 
   auto app_mobile_commands = app_mobile_commands_.find(application);
   if (app_mobile_commands_.end() != app_mobile_commands) {
-    LOG4CXX_DEBUG(logger_, "Clearing mobile command(s): "
-                  << app_mobile_commands->second.size());
+    LOG4CXX_DEBUG(
+        logger_,
+        "Clearing mobile command(s): " << app_mobile_commands->second.size());
     app_mobile_commands_.erase(app_mobile_commands);
   }
 }
@@ -99,8 +104,8 @@ void CommandHolderImpl::ResumeHmiCommand(ApplicationSharedPtr application) {
     return;
   }
 
-  LOG4CXX_DEBUG(logger_, "Resuming HMI command(s): "
-                << app_hmi_commands_.size());
+  LOG4CXX_DEBUG(logger_,
+                "Resuming HMI command(s): " << app_hmi_commands_.size());
 
   for (auto cmd : app_commands->second) {
     (*cmd)[strings::msg_params][strings::app_id] = application->hmi_app_id();
@@ -117,15 +122,13 @@ void CommandHolderImpl::ResumeMobileCommand(ApplicationSharedPtr application) {
     return;
   }
 
-  LOG4CXX_DEBUG(logger_, "Resuming mobile command(s): "
-                << app_mobile_commands_.size());
+  LOG4CXX_DEBUG(logger_,
+                "Resuming mobile command(s): " << app_mobile_commands_.size());
 
   for (auto cmd : app_commands->second) {
-    (*cmd)[strings::params][strings::connection_key] =
-        application->app_id();
+    (*cmd)[strings::params][strings::connection_key] = application->app_id();
     app_manager_.ManageMobileCommand(
-          cmd,
-          commands::Command::CommandOrigin::ORIGIN_MOBILE);
+        cmd, commands::Command::CommandOrigin::ORIGIN_MOBILE);
   }
 
   app_mobile_commands_.erase(app_commands);
diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
index fda4d09de2..cb6534dd2d 100644
--- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
+++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
@@ -641,26 +641,25 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
   }
 
   if (ApplicationType::kSwitchedApplicationWrongHashId == app_type) {
-     LOG4CXX_DEBUG(logger_,
-           "Application has been switched from another transport, "
-           "but doesn't have correct hashID.");
-
-     application_manager::RecallApplicationData(application,
-                                                application_manager_);
-
-     SendResponse(true, mobile_apis::Result::RESUME_FAILED, NULL,
-                  &response_params);
-     return;
-   }
-
-   if (ApplicationType::kSwitchedApplicationHashOk == app_type) {
-     LOG4CXX_DEBUG(logger_,
-           "Application has been switched from another transport "
-           "and has correct hashID.");
-     SendResponse(true, mobile_apis::Result::SUCCESS, NULL,
-                  &response_params);
-     return;
-   }
+    LOG4CXX_DEBUG(logger_,
+                  "Application has been switched from another transport, "
+                  "but doesn't have correct hashID.");
+
+    application_manager::RecallApplicationData(application,
+                                               application_manager_);
+
+    SendResponse(
+        true, mobile_apis::Result::RESUME_FAILED, NULL, &response_params);
+    return;
+  }
+
+  if (ApplicationType::kSwitchedApplicationHashOk == app_type) {
+    LOG4CXX_DEBUG(logger_,
+                  "Application has been switched from another transport "
+                  "and has correct hashID.");
+    SendResponse(true, mobile_apis::Result::SUCCESS, NULL, &response_params);
+    return;
+  }
 
   bool resumption =
       (*message_)[strings::msg_params].keyExists(strings::hash_id);
@@ -1469,10 +1468,10 @@ bool RegisterAppInterfaceRequest::IsApplicationSwitched() {
 
   auto app_type = ApplicationType::kSwitchedApplicationWrongHashId;
   if ((*message_)[strings::msg_params].keyExists(strings::hash_id)) {
-    const auto hash_id = 
+    const auto hash_id =
         (*message_)[strings::msg_params][strings::hash_id].asString();
-    
-    auto& resume_ctrl = application_manager_.resume_controller();  
+
+    auto& resume_ctrl = application_manager_.resume_controller();
     if (resume_ctrl.CheckApplicationHash(app, hash_id)) {
       app_type = ApplicationType::kSwitchedApplicationHashOk;
     }
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index e5bf7a2a7c..41e7990e43 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -852,7 +852,7 @@ uint32_t PolicyHandler::ChooseRandomAppForPolicyUpdate(
   return 0;
 }
 
-void PolicyHandler::OnDeviceSwitching(const std::string& device_id_from, 
+void PolicyHandler::OnDeviceSwitching(const std::string& device_id_from,
                                       const std::string& device_id_to) {
   LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
diff --git a/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc b/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc
index 471270f9b8..b9437d55e0 100644
--- a/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc
+++ b/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc
@@ -172,15 +172,11 @@ TEST_F(ApplicationManagerImplMockHmiTest,
 
   app_manager_impl_->AddMockApplication(app_impl);
 
-  const connection_handler::Device bt(device_id,
-                                      "BT_device",
-                                      mac_address,
-                                      "BLUETOOTH");
+  const connection_handler::Device bt(
+      device_id, "BT_device", mac_address, "BLUETOOTH");
 
-  const connection_handler::Device usb(device_id + 1,
-                                      "USB_device",
-                                      "USB_serial",
-                                      "USB_IOS");
+  const connection_handler::Device usb(
+      device_id + 1, "USB_device", "USB_serial", "USB_IOS");
 
   MockHMICommandFactory* mock_hmi_factory =
       MockHMICommandFactory::mock_hmi_command_factory();
@@ -218,8 +214,8 @@ TEST_F(ApplicationManagerImplMockHmiTest,
       utils::MakeShared<smart_objects::SmartObject>();
 
   (*hmi_msg_1)[strings::msg_params][strings::app_id] =
-  (*hmi_msg_2)[strings::msg_params][strings::app_id] =
-  (*hmi_msg_3)[strings::msg_params][strings::app_id] = application_id;
+      (*hmi_msg_2)[strings::msg_params][strings::app_id] =
+          (*hmi_msg_3)[strings::msg_params][strings::app_id] = application_id;
 
   EXPECT_CALL(*cmd_1, Init()).Times(0);
   EXPECT_CALL(*cmd_2, Init()).Times(0);
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 4398952237..4ebbbe7141 100644
--- a/src/components/application_manager/test/application_manager_impl_test.cc
+++ b/src/components/application_manager/test/application_manager_impl_test.cc
@@ -715,10 +715,8 @@ TEST_F(ApplicationManagerImplTest,
 
   // Act
   const connection_handler::DeviceHandle switching_handle = 1;
-  const connection_handler::Device switching_device(switching_handle,
-                                                    "switching_device",
-                                                    switching_device_id,
-                                                    "BLUETOOTH");
+  const connection_handler::Device switching_device(
+      switching_handle, "switching_device", switching_device_id, "BLUETOOTH");
 
   const connection_handler::DeviceHandle non_switching_handle = 2;
   const connection_handler::Device non_switching_device(non_switching_handle,
@@ -775,10 +773,8 @@ TEST_F(ApplicationManagerImplTest,
 
   // Act
   const connection_handler::DeviceHandle switching_handle = 1;
-  const connection_handler::Device switching_device(switching_handle,
-                                                    "switching_device",
-                                                    switching_device_id,
-                                                    "BLUETOOTH");
+  const connection_handler::Device switching_device(
+      switching_handle, "switching_device", switching_device_id, "BLUETOOTH");
 
   const connection_handler::DeviceHandle non_switching_handle = 2;
   const connection_handler::Device non_switching_device(non_switching_handle,
diff --git a/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc b/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc
index bf619e5229..b7a004f199 100644
--- a/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc
@@ -432,7 +432,7 @@ TEST_F(RegisterAppInterfaceRequestTest,
               mock_app),
           request_hash_id)).WillOnce(Return(true));
 
-   EXPECT_CALL(mock_resume_crt_, RemoveApplicationFromSaved(_)).Times(0);
+  EXPECT_CALL(mock_resume_crt_, RemoveApplicationFromSaved(_)).Times(0);
 
   EXPECT_CALL(mock_application_helper_, RecallApplicationData(_, _)).Times(0);
 
@@ -467,7 +467,7 @@ TEST_F(RegisterAppInterfaceRequestTest,
               mock_app),
           request_hash_id)).WillOnce(Return(false));
 
-   EXPECT_CALL(
+  EXPECT_CALL(
       mock_application_helper_,
       RecallApplicationData(
           MockAppPtr::static_pointer_cast<application_manager::Application>(
diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc
index 9f68d5ce31..bc46d6e7c8 100644
--- a/src/components/connection_handler/src/connection_handler_impl.cc
+++ b/src/components/connection_handler/src/connection_handler_impl.cc
@@ -198,28 +198,31 @@ void ConnectionHandlerImpl::OnDeviceSwitchingFinish(
   }
 }
 
-namespace  {
+namespace {
 struct DeviceFinder {
-  explicit DeviceFinder(const std::string& device_uid) 
-    : device_uid_(device_uid) {}
+  explicit DeviceFinder(const std::string& device_uid)
+      : device_uid_(device_uid) {}
   bool operator()(const DeviceMap::value_type& device) {
-     return device_uid_ == device.second.mac_address();
-   }
-private:
+    return device_uid_ == device.second.mac_address();
+  }
+
+ private:
   const std::string& device_uid_;
 };
-} // namespace 
+}  // namespace
 
 void ConnectionHandlerImpl::OnDeviceSwitchingStart(
     const std::string& device_uid_from, const std::string& device_uid_to) {
-  auto device_from = std::find_if(
-        device_list_.begin(), device_list_.end(), 
-                  DeviceFinder(encryption::MakeHash(device_uid_from)));
-  
-  auto device_to = std::find_if(
-        device_list_.begin(), device_list_.end(), 
-                  DeviceFinder(encryption::MakeHash(device_uid_to)));
-  
+  auto device_from =
+      std::find_if(device_list_.begin(),
+                   device_list_.end(),
+                   DeviceFinder(encryption::MakeHash(device_uid_from)));
+
+  auto device_to =
+      std::find_if(device_list_.begin(),
+                   device_list_.end(),
+                   DeviceFinder(encryption::MakeHash(device_uid_to)));
+
   DCHECK_OR_RETURN_VOID(device_list_.end() != device_from);
   DCHECK_OR_RETURN_VOID(device_list_.end() != device_to);
   sync_primitives::AutoReadLock read_lock(connection_handler_observer_lock_);
diff --git a/src/components/connection_handler/test/connection_handler_impl_test.cc b/src/components/connection_handler/test/connection_handler_impl_test.cc
index 3967fb247f..b6783c64ef 100644
--- a/src/components/connection_handler/test/connection_handler_impl_test.cc
+++ b/src/components/connection_handler/test/connection_handler_impl_test.cc
@@ -472,11 +472,10 @@ TEST_F(ConnectionHandlerTest, IsHeartBeatSupported) {
 }
 
 MATCHER_P(SameDevice, device, "") {
-  return
-  arg.device_handle() == device.device_handle() &&
-  arg.user_friendly_name() == device.user_friendly_name() &&
-  arg.mac_address() == device.mac_address() &&
-  arg.connection_type() == device.connection_type();
+  return arg.device_handle() == device.device_handle() &&
+         arg.user_friendly_name() == device.user_friendly_name() &&
+         arg.mac_address() == device.mac_address() &&
+         arg.connection_type() == device.connection_type();
 }
 
 TEST_F(ConnectionHandlerTest, SendEndServiceWithoutSetProtocolHandler) {
@@ -1908,10 +1907,8 @@ TEST_F(ConnectionHandlerTest, OnDeviceConnectionSwitching) {
   connection_handler_->set_connection_handler_observer(
       &mock_connection_handler_observer);
 
-  const transport_manager::DeviceInfo device_info_1(device_handle_,
-                                                    mac_address_,
-                                                    device_name_,
-                                                    connection_type_);
+  const transport_manager::DeviceInfo device_info_1(
+      device_handle_, mac_address_, device_name_, connection_type_);
 
   connection_handler_->OnDeviceAdded(device_info_1);
 
diff --git a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
index bb4e5d3e21..931fd6cfb4 100644
--- a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
+++ b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
@@ -255,8 +255,9 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
   MOCK_METHOD2(SetDefaultHmiTypes,
                void(const std::string& application_id,
                     const smart_objects::SmartObject* app_types));
-  MOCK_METHOD2(OnDeviceSwitching, void(const std::string& device_id_from,
-                                       const std::string& device_id_to));
+  MOCK_METHOD2(OnDeviceSwitching,
+               void(const std::string& device_id_from,
+                    const std::string& device_id_to));
 #endif  // SDL_REMOTE_CONTROL
 
  private:
diff --git a/src/components/include/test/connection_handler/mock_connection_handler_observer.h b/src/components/include/test/connection_handler/mock_connection_handler_observer.h
index 0d0d362adb..9ca19f25f0 100644
--- a/src/components/include/test/connection_handler/mock_connection_handler_observer.h
+++ b/src/components/include/test/connection_handler/mock_connection_handler_observer.h
@@ -67,9 +67,9 @@ class MockConnectionHandlerObserver
       GetHandshakeContext,
       security_manager::SSLContext::HandshakeContext(uint32_t key));
 
-  MOCK_METHOD2(OnDeviceSwitchingStart, void(
-                 const connection_handler::Device& device_from,
-                 const connection_handler::Device& device_to));
+  MOCK_METHOD2(OnDeviceSwitchingStart,
+               void(const connection_handler::Device& device_from,
+                    const connection_handler::Device& device_to));
   MOCK_METHOD1(OnDeviceSwitchingFinish, void(const std::string& device_uid));
 };
 
diff --git a/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h b/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h
index 2f3c785865..5aa92446b6 100644
--- a/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h
+++ b/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h
@@ -247,8 +247,9 @@ class MockCacheManagerInterface : public ::policy::CacheManagerInterface {
                GroupsByExternalConsentStatus(const ExternalConsentStatus&));
   MOCK_METHOD0(GetKnownLinksFromPT, std::map<std::string, std::string>());
   MOCK_METHOD1(SetExternalConsentForApp, void(const PermissionConsent&));
-  MOCK_METHOD2(OnDeviceSwitching, void(const std::string& device_id_from,
-                                       const std::string& device_id_to));
+  MOCK_METHOD2(OnDeviceSwitching,
+               void(const std::string& device_id_from,
+                    const std::string& device_id_to));
 };
 
 }  // namespace policy_test
diff --git a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h
index 3b835be422..9e487da4ba 100644
--- a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h
+++ b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h
@@ -215,8 +215,9 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD0(GetExternalConsentStatus, ExternalConsentStatus());
   MOCK_CONST_METHOD1(IsNeedToUpdateExternalConsentStatus,
                      bool(const ExternalConsentStatus&));
-  MOCK_METHOD2(OnDeviceSwitching, void(const std::string& device_id_from,
-                                       const std::string& device_id_to));
+  MOCK_METHOD2(OnDeviceSwitching,
+               void(const std::string& device_id_from,
+                    const std::string& device_id_to));
 };
 }  // namespace policy_manager_test
 }  // namespace components
diff --git a/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h b/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h
index 9a254417ec..ed3a5088c1 100644
--- a/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h
+++ b/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h
@@ -211,8 +211,9 @@ class MockCacheManagerInterface : public CacheManagerInterface {
   MOCK_CONST_METHOD2(AppHasHMIType,
                      bool(const std::string& application_id,
                           policy_table::AppHMIType hmi_type));
-  MOCK_METHOD2(OnDeviceSwitching, void(const std::string& device_id_from,
-                                       const std::string& device_id_to));
+  MOCK_METHOD2(OnDeviceSwitching,
+               void(const std::string& device_id_from,
+                    const std::string& device_id_to));
 };
 
 }  // namespace policy_test
diff --git a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h
index 66fc9bcf8d..82012b83c7 100644
--- a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h
+++ b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h
@@ -223,8 +223,9 @@ class MockPolicyManager : public PolicyManager {
       void(const std::string& policy_app_id,
            const std::vector<FunctionalGroupPermission>& current_permissions));
 
-  MOCK_METHOD2(OnDeviceSwitching, void(const std::string& device_id_from,
-                                       const std::string& device_id_to));
+  MOCK_METHOD2(OnDeviceSwitching,
+               void(const std::string& device_id_from,
+                    const std::string& device_id_to));
 };
 
 }  // namespace policy_manager_test
diff --git a/src/components/include/test/transport_manager/mock_transport_manager_listener.h b/src/components/include/test/transport_manager/mock_transport_manager_listener.h
index 2099c2c56b..f4c4fdcf68 100644
--- a/src/components/include/test/transport_manager/mock_transport_manager_listener.h
+++ b/src/components/include/test/transport_manager/mock_transport_manager_listener.h
@@ -81,8 +81,9 @@ class MockTransportManagerListener : public TransportManagerListener {
   MOCK_METHOD2(OnTMMessageSendFailed,
                void(const DataSendError& error,
                     const ::protocol_handler::RawMessagePtr message));
-  MOCK_METHOD2(OnDeviceSwitchingStart, void(const DeviceUID& device_uid_from,
-                                            const DeviceUID& device_uid_to));
+  MOCK_METHOD2(OnDeviceSwitchingStart,
+               void(const DeviceUID& device_uid_from,
+                    const DeviceUID& device_uid_to));
   MOCK_METHOD1(OnDeviceSwitchingFinish, void(const DeviceUID& device_uid));
 };
 
diff --git a/src/components/include/transport_manager/transport_adapter/device.h b/src/components/include/transport_manager/transport_adapter/device.h
index 4616a8cfc2..148e715050 100644
--- a/src/components/include/transport_manager/transport_adapter/device.h
+++ b/src/components/include/transport_manager/transport_adapter/device.h
@@ -137,6 +137,7 @@ class Device {
   inline std::string transport_switch_id() const {
     return transport_switch_id_;
   }
+
  private:
   /**
    * @brief Device user-friendly name.
diff --git a/src/components/policy/policy_external/src/cache_manager.cc b/src/components/policy/policy_external/src/cache_manager.cc
index 70739c9159..a9b599f981 100644
--- a/src/components/policy/policy_external/src/cache_manager.cc
+++ b/src/components/policy/policy_external/src/cache_manager.cc
@@ -2645,8 +2645,8 @@ void CacheManager::OnDeviceSwitching(const std::string& device_id_from,
   auto& consents_to = *(to->second.user_consent_records);
 
   LOG4CXX_DEBUG(logger_,
-                "Merging user consents from device: " << device_id_from <<
-                " to device: " << device_id_to);
+                "Merging user consents from device: "
+                    << device_id_from << " to device: " << device_id_to);
   for (auto f = consents_from.begin(); f != consents_from.end(); ++f) {
     const auto app_id = f->first;
     LOG4CXX_DEBUG(logger_, "Updating permissions for key: " << app_id);
diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc
index 24bfd3a4d1..806b7e13ba 100644
--- a/src/components/policy/policy_external/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_external/src/policy_manager_impl.cc
@@ -1681,8 +1681,8 @@ void PolicyManagerImpl::OnAppRegisteredOnMobile(
   SendNotificationOnPermissionsUpdated(application_id);
 }
 
-void PolicyManagerImpl::OnDeviceSwitching(
-    const std::string& device_id_from, const std::string& device_id_to) {
+void PolicyManagerImpl::OnDeviceSwitching(const std::string& device_id_from,
+                                          const std::string& device_id_to) {
   LOG4CXX_AUTO_TRACE(logger_);
   cache_->OnDeviceSwitching(device_id_from, device_id_to);
 }
diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc
index cf106ceb52..055b57d985 100644
--- a/src/components/policy/policy_regular/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc
@@ -366,8 +366,8 @@ void PolicyManagerImpl::OnAppRegisteredOnMobile(
   SendNotificationOnPermissionsUpdated(application_id);
 }
 
-void PolicyManagerImpl::OnDeviceSwitching(
-    const std::string& device_id_from, const std::string& device_id_to) {
+void PolicyManagerImpl::OnDeviceSwitching(const std::string& device_id_from,
+                                          const std::string& device_id_to) {
   LOG4CXX_AUTO_TRACE(logger_);
   cache_->OnDeviceSwitching(device_id_from, device_id_to);
 }
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h
index 9b853d9610..8a8031c3cf 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h
@@ -263,7 +263,7 @@ class TransportAdapterListenerImpl
    */
   virtual void OnCommunicationError(const TransportAdapter* adapter,
                                     const DeviceUID& device,
-                            const ApplicationHandle& app_id) OVERRIDE;
+                                    const ApplicationHandle& app_id) OVERRIDE;
 
   /**
    * @brief OnTransportSwitchRequested notifies on received signal to start
diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
index 7b93bf9044..98e03ef911 100644
--- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
+++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
@@ -906,12 +906,11 @@ SwitchableDevices TransportAdapterImpl::GetSwitchableDevices() const {
                     "Device is not suitable for switching: " << device_uid);
       continue;
     }
-    LOG4CXX_DEBUG(logger_,
-                  "Device is suitable for switching: " << device_uid);
+    LOG4CXX_DEBUG(logger_, "Device is suitable for switching: " << device_uid);
     devices.insert(std::make_pair(device_uid, transport_switch_id));
   }
   LOG4CXX_INFO(logger_,
-                "Found number of switchable devices: " << devices.size());
+               "Found number of switchable devices: " << devices.size());
   return devices;
 }
 
diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc
index 7b4e722b4d..26cc65d94f 100644
--- a/src/components/transport_manager/src/transport_manager_impl.cc
+++ b/src/components/transport_manager/src/transport_manager_impl.cc
@@ -763,7 +763,8 @@ void TransportManagerImpl::TryDeviceSwitch(
       transport_adapters_.begin(), transport_adapters_.end(), TAFinder());
 
   if (transport_adapters_.end() == ios_bt_adapter) {
-    LOG4CXX_WARN(logger_,
+    LOG4CXX_WARN(
+        logger_,
         "There is no iAP2 Bluetooth adapter found. Switching is not possible.");
     return;
   }
@@ -791,18 +792,18 @@ void TransportManagerImpl::TryDeviceSwitch(
 
   LOG4CXX_DEBUG(logger_,
                 "Found UUID suitable for transport switching: " << bt->second);
-  LOG4CXX_DEBUG(logger_,
-                "Device to switch from: " << bt->first
-                                          << " to: " << usb->first);
+  LOG4CXX_DEBUG(
+      logger_, "Device to switch from: " << bt->first << " to: " << usb->first);
 
   sync_primitives::AutoWriteLock lock(device_to_adapter_map_lock_);
 
   const auto bt_device_uid = bt->first;
   const auto device_to_switch = device_to_adapter_map_.find(bt_device_uid);
   if (device_to_adapter_map_.end() == device_to_switch) {
-    LOG4CXX_ERROR(logger_, "There is no known device found with UID "
-                  << bt_device_uid
-                  << " . Transport switching is not possible.");
+    LOG4CXX_ERROR(logger_,
+                  "There is no known device found with UID "
+                      << bt_device_uid
+                      << " . Transport switching is not possible.");
     DCHECK_OR_RETURN_VOID(false);
     return;
   }
@@ -811,8 +812,9 @@ void TransportManagerImpl::TryDeviceSwitch(
   const auto bt_uid = device_to_switch->first;
   const auto bt_adapter = device_to_switch->second;
 
-  LOG4CXX_DEBUG(logger_, "Known device with UID "
-                << bt_uid << " is appropriate for transport switching.");
+  LOG4CXX_DEBUG(logger_,
+                "Known device with UID "
+                    << bt_uid << " is appropriate for transport switching.");
 
   RaiseEvent(
       &TransportManagerListener::OnDeviceSwitchingStart, bt_uid, usb_uid);
@@ -878,18 +880,20 @@ bool TransportManagerImpl::UpdateDeviceMapping(
     const auto result =
         device_to_adapter_map_.insert(std::make_pair(device_uid, ta));
     if (!result.second) {
-      LOG4CXX_WARN(logger_, "Device UID "
-                   << device_uid
-                   << " is known already. Processing skipped."
-                      "Connection type is: " << ta->GetConnectionType());
+      LOG4CXX_WARN(logger_,
+                   "Device UID "
+                       << device_uid
+                       << " is known already. Processing skipped."
+                          "Connection type is: " << ta->GetConnectionType());
       continue;
     }
-      DeviceHandle device_handle =
-          converter_.UidToHandle(device_uid, ta->GetConnectionType());
-      DeviceInfo info(
-          device_handle, device_uid, ta->DeviceName(device_uid),
-            ta->GetConnectionType());
-      RaiseEvent(&TransportManagerListener::OnDeviceFound, info);
+    DeviceHandle device_handle =
+        converter_.UidToHandle(device_uid, ta->GetConnectionType());
+    DeviceInfo info(device_handle,
+                    device_uid,
+                    ta->DeviceName(device_uid),
+                    ta->GetConnectionType());
+    RaiseEvent(&TransportManagerListener::OnDeviceFound, info);
   }
 
   LOG4CXX_DEBUG(logger_,
diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h
index 29bf7c8e83..03e7630e8b 100644
--- a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h
@@ -121,7 +121,7 @@ class MockTransportAdapterListener : public TransportAdapterListener {
                     const DeviceUID&,
                     const ApplicationHandle&));
   MOCK_METHOD1(OnTransportSwitchRequested,
-                     void(const TransportAdapter* transport_adapter));
+               void(const TransportAdapter* transport_adapter));
 };
 
 }  // namespace transport_manager_test
diff --git a/src/components/transport_manager/test/transport_manager_impl_test.cc b/src/components/transport_manager/test/transport_manager_impl_test.cc
index 7380d68bbc..dc285d099c 100644
--- a/src/components/transport_manager/test/transport_manager_impl_test.cc
+++ b/src/components/transport_manager/test/transport_manager_impl_test.cc
@@ -1085,8 +1085,10 @@ TEST_F(
     TransportManagerImplTest,
     UpdateDeviceList_AddSameUUIDNonSwitchableDevices_TwoTransportAdapters_ExpectNoSwitch) {
   device_list_.push_back(dev_info_.mac_address());
-  SetAddDeviceExpectations(
-      mock_adapter_, transport_adapter::DeviceType::TCP, device_list_, dev_info_);
+  SetAddDeviceExpectations(mock_adapter_,
+                           transport_adapter::DeviceType::TCP,
+                           device_list_,
+                           dev_info_);
 
   tm_.OnDeviceListUpdated(mock_adapter_);
 
@@ -1156,8 +1158,10 @@ TEST_F(TransportManagerImplTest,
   device_list_.push_back(dev_info_.mac_address());
   const uint32_t timeout = 0;
 
-  SetAddDeviceExpectations(
-      mock_adapter_, transport_adapter::DeviceType::IOS_BT, device_list_, dev_info_);
+  SetAddDeviceExpectations(mock_adapter_,
+                           transport_adapter::DeviceType::IOS_BT,
+                           device_list_,
+                           dev_info_);
 
   EXPECT_CALL(*tm_listener_, OnDeviceFound(dev_info_));
 
@@ -1230,8 +1234,10 @@ TEST_F(TransportManagerImplTest,
        TwoTransportAdapterAddSameDeviceSecondSkipped) {
   device_list_.push_back(dev_info_.mac_address());
 
-  SetAddDeviceExpectations(
-      mock_adapter_, transport_adapter::DeviceType::IOS_BT, device_list_, dev_info_);
+  SetAddDeviceExpectations(mock_adapter_,
+                           transport_adapter::DeviceType::IOS_BT,
+                           device_list_,
+                           dev_info_);
 
   EXPECT_CALL(*tm_listener_, OnDeviceFound(_));
 
@@ -1266,8 +1272,10 @@ TEST_F(TransportManagerImplTest,
 
 TEST_F(TransportManagerImplTest, NoDeviceTransportSwitchRequest_Fail) {
   device_list_.push_back(dev_info_.mac_address());
-  SetAddDeviceExpectations(
-      mock_adapter_, transport_adapter::DeviceType::IOS_USB,  device_list_, dev_info_);
+  SetAddDeviceExpectations(mock_adapter_,
+                           transport_adapter::DeviceType::IOS_USB,
+                           device_list_,
+                           dev_info_);
 
   EXPECT_CALL(*tm_listener_, OnDeviceFound(_));
 
@@ -1280,15 +1288,16 @@ TEST_F(TransportManagerImplTest, NoDeviceTransportSwitchRequest_Fail) {
 
   EXPECT_CALL(*mock_adapter_, StopDevice(mac_address_)).Times(0);
 
-  EXPECT_CALL(*tm_listener_, OnDeviceSwitchingStart(mac_address_, mac_address_)).Times(0);
+  EXPECT_CALL(*tm_listener_, OnDeviceSwitchingStart(mac_address_, mac_address_))
+      .Times(0);
 
   tm_.TestHandle(
       TransportAdapterEvent(EventTypeEnum::ON_TRANSPORT_SWITCH_REQUESTED,
                             mock_adapter_,
-                                       mac_address_,
-                                       application_id_,
-                                       test_message_,
-                                       error_));
+                            mac_address_,
+                            application_id_,
+                            test_message_,
+                            error_));
 
   device_list_.pop_back();
 }