I regret trusting my auto-formatter; more style change revertsfix/lock_scoping

2 files changed, 15 insertions, 22 deletions

diff --git a/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc b/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
index a5f7fa40d6..2306b8bb6d 100644
--- a/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
+++ b/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
@@ -367,8 +367,7 @@ typedef Types<OnVIAccPedalPositionNotification,
               OnVITirePressureNotification,
               OnVIVehicleDataNotification,
               OnVIVinNotification,
-              OnVIWiperStatusNotification>
-    HMIOnViNotificationsTypes;
+              OnVIWiperStatusNotification> HMIOnViNotificationsTypes;
 
 typedef Types<OnAppPermissionChangedNotification,
               OnAudioDataStreamingNotification,
@@ -381,8 +380,7 @@ typedef Types<OnAppPermissionChangedNotification,
               OnSDLPersistenceCompleteNotification,
               OnStatusUpdateNotification,
               OnVideoDataStreamingNotification,
-              OnRecordStartdNotification>
-    HMIOnNotificationsListToHMITypes;
+              OnRecordStartdNotification> HMIOnNotificationsListToHMITypes;
 
 typedef Types<
     CommandPair<OnAppActivatedNotification,
@@ -1127,8 +1125,7 @@ TEST_F(HMICommandsNotificationsTest,
     EXPECT_CALL(app_mngr_, application(kAppId_)).WillRepeatedly(Return(app_));
     EXPECT_CALL(mock_message_helper_,
                 GetOnAppInterfaceUnregisteredNotificationToMobile(
-                    kAppId_, *it_mobile_reason))
-        .WillOnce(Return(notification));
+                    kAppId_, *it_mobile_reason)).WillOnce(Return(notification));
     EXPECT_CALL(app_mngr_,
                 ManageMobileCommand(notification, Command::ORIGIN_SDL));
     EXPECT_CALL(app_mngr_,
@@ -1490,11 +1487,10 @@ TEST_F(HMICommandsNotificationsTest,
             [am::strings::id] = "2014";
   utils::SharedPtr<Command> command =
       CreateCommand<OnDeviceChosenNotification>(message);
-  EXPECT_CALL(
-      app_mngr_,
-      ConnectToDevice((*message)[am::strings::msg_params]
-                                [am::strings::device_info][am::strings::id]
-                                    .asString()));
+  EXPECT_CALL(app_mngr_,
+              ConnectToDevice(
+                  (*message)[am::strings::msg_params][am::strings::device_info]
+                            [am::strings::id].asString()));
   command->Run();
 }
 
diff --git a/src/components/application_manager/test/state_controller/state_controller_test.cc b/src/components/application_manager/test/state_controller/state_controller_test.cc
index c31597367c..e97ef072e9 100644
--- a/src/components/application_manager/test/state_controller/state_controller_test.cc
+++ b/src/components/application_manager/test/state_controller/state_controller_test.cc
@@ -60,14 +60,14 @@ using am::HmiState;
 using am::HmiStatePtr;
 using am::UsageStatistics;
 using ::testing::_;
-using ::testing::AtLeast;
-using ::testing::InSequence;
-using ::testing::Mock;
-using ::testing::NiceMock;
 using ::testing::Return;
-using ::testing::ReturnPointee;
 using ::testing::ReturnRef;
+using ::testing::ReturnPointee;
+using ::testing::Mock;
+using ::testing::NiceMock;
+using ::testing::InSequence;
 using ::testing::Truly;
+using ::testing::AtLeast;
 
 namespace test {
 namespace components {
@@ -1053,8 +1053,7 @@ class StateControllerImplTest : public ::testing::Test {
     for (uint32_t i = 0; i < state_ids.size(); ++i) {
       am::HmiState::StateID state_id = state_ids[i];
       EXPECT_CALL(application,
-                  AddHMIState(Truly(HmiStatesIDComparator(state_id))))
-          .Times(1);
+                  AddHMIState(Truly(HmiStatesIDComparator(state_id)))).Times(1);
 
       switch (state_id) {
         case am::HmiState::StateID::STATE_ID_VR_SESSION: {
@@ -1907,8 +1906,7 @@ TEST_F(StateControllerImplTest, SendEventBCActivateApp_HMIReceivesError) {
     EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(simple_app_))
         .Times(0);
     EXPECT_CALL(app_manager_mock_,
-                OnHMILevelChanged(simple_app_->app_id(), _, _))
-        .Times(0);
+                OnHMILevelChanged(simple_app_->app_id(), _, _)).Times(0);
 
     smart_objects::SmartObject message;
     message[am::strings::params][am::hmi_response::code] = *it;
@@ -2462,8 +2460,7 @@ TEST_F(StateControllerImplTest, SetRegularStateMediaToNonMediaApp_VR_Stopped) {
   EXPECT_CALL(*simple_app_ptr_, is_resuming()).WillRepeatedly(Return(false));
 
   EXPECT_CALL(message_helper_mock_,
-              SendOnResumeAudioSourceToHMI(simple_app_id_, _))
-      .Times(0);
+              SendOnResumeAudioSourceToHMI(simple_app_id_, _)).Times(0);
   EXPECT_CALL(*simple_app_ptr_,
               SetPostponedState(Truly(HmiStatesComparator(check_state))))
       .Times(0);