Lock Rotation on user settings changes

ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/chromeos/rotation/tray_rotation_lock.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_widget.h"
@@ skipping 100 matching lines @@
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(false);
 }
 
 // Tests that when the tray view is created, while MaximizeMode is active, and
 // rotation is locked, that it is visible.
 TEST_F(TrayRotationLockTest, CreateTrayViewDuringMaximizeModeAndRotationLock) {
   TearDownViews();
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(true);
-  Shell::GetInstance()-> maximize_mode_controller()->set_rotation_locked(true);
+  Shell::GetInstance()-> maximize_mode_controller()->SetRotationLocked(true);
   SetUpForStatusAreaWidget(StatusAreaWidgetTestHelper::GetStatusAreaWidget());
   EXPECT_TRUE(tray_view()->visible());
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(false);
+  EXPECT_FALSE(tray_view()->visible());
 }
 
 // Tests that the enabling of MaximizeMode affects a previously created tray
 // view, changing the visibility.
 TEST_F(TrayRotationLockTest, TrayViewVisibilityChangesDuringMaximizeMode) {
-  TearDownViews();
+  ASSERT_FALSE(tray_view()->visible());
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(true);
-  Shell::GetInstance()-> maximize_mode_controller()->set_rotation_locked(true);
-  SetUpForStatusAreaWidget(StatusAreaWidgetTestHelper::GetStatusAreaWidget());
+  Shell::GetInstance()->maximize_mode_controller()->SetRotationLocked(true);
   EXPECT_TRUE(tray_view()->visible());
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(false);
   EXPECT_FALSE(tray_view()->visible());
 }
 
 // Tests that the when the tray view is created for a secondary display, that
 // it is not visible, and that MaximizeMode does not affect visibility.
 TEST_F(TrayRotationLockTest, CreateSecondaryTrayView) {
   if (!SupportsMultipleDisplays())
@@ skipping 67 matching lines @@
       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 0.0f, 0.0f), 0);
   default_view()->OnGestureEvent(&tap);
   EXPECT_TRUE(maximize_mode_controller->rotation_locked());
   EXPECT_TRUE(tray_view()->visible());
 
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(false);
 }
 
 }  // namespace ash