[merge to M59] cros: Update rotation lock UI

ash/system/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/rotation/tray_rotation_lock.h"
 
 #include <memory>
 
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/root_window_controller.h"
@@ skipping 97 matching lines @@
   test::AshTestBase::TearDown();
 }
 
 // Tests that when the tray view is initially created, that it is created
 // not visible.
 TEST_F(TrayRotationLockTest, CreateTrayView) {
   EXPECT_FALSE(tray_view()->visible());
 }
 
 // Tests that when the tray view is created, while MaximizeMode is active, that
-// it is not visible.
+// it must be visible, and becomes invisible exiting MaximizeMode.
 TEST_F(TrayRotationLockTest, CreateTrayViewDuringMaximizeMode) {
   TearDownViews();
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   SetUpForStatusAreaWidget(StatusAreaWidgetTestHelper::GetStatusAreaWidget());
-  EXPECT_FALSE(tray_view()->visible());
-  Shell::Get()->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::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
-      true);
-  Shell::Get()->screen_orientation_controller()->ToggleUserRotationLock();
-  SetUpForStatusAreaWidget(StatusAreaWidgetTestHelper::GetStatusAreaWidget());
   EXPECT_TRUE(tray_view()->visible());
   Shell::Get()->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) {
   ASSERT_FALSE(tray_view()->visible());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   Shell::Get()->screen_orientation_controller()->ToggleUserRotationLock();
   EXPECT_TRUE(tray_view()->visible());
   Shell::Get()->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.
+// Tests that 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) {
   UpdateDisplay("400x400,200x200");
 
   SetUpForStatusAreaWidget(
       StatusAreaWidgetTestHelper::GetSecondaryStatusAreaWidget());
   EXPECT_FALSE(tray_view()->visible());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   EXPECT_FALSE(tray_view()->visible());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
@@ skipping 10 matching lines @@
 // Tests that when the default view is created, while MaximizeMode is active,
 // that it is visible.
 TEST_F(TrayRotationLockTest, CreateDefaultViewDuringMaximizeMode) {
   TearDownViews();
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   SetUpForStatusAreaWidget(StatusAreaWidgetTestHelper::GetStatusAreaWidget());
   EXPECT_TRUE(default_view()->visible());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
+  EXPECT_FALSE(default_view()->visible());
 }
 
 // Tests that the enabling of MaximizeMode affects a previously created default
 // view, changing the visibility.
 TEST_F(TrayRotationLockTest, DefaultViewVisibilityChangesDuringMaximizeMode) {
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   EXPECT_TRUE(default_view()->visible());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_FALSE(default_view()->visible());
 }
 
 // Tests that no default view is created when the target is a secondary
 // display.
 TEST_F(TrayRotationLockTest, CreateSecondaryDefaultView) {
   UpdateDisplay("400x400,200x200");
 
   TearDownViews();
   SetUpForStatusAreaWidget(
       StatusAreaWidgetTestHelper::GetSecondaryStatusAreaWidget());
   EXPECT_EQ(NULL, default_view());
 }
 
 // Tests that activating the default view causes the display to have its
-// rotation locked, and that the tray view becomes visible.
+// rotation locked.
 TEST_F(TrayRotationLockTest, PerformActionOnDefaultView) {
   MaximizeModeController* maximize_mode_controller =
       Shell::Get()->maximize_mode_controller();
   ScreenOrientationController* screen_orientation_controller =
       Shell::Get()->screen_orientation_controller();
   ASSERT_FALSE(screen_orientation_controller->rotation_locked());
   maximize_mode_controller->EnableMaximizeModeWindowManager(true);
-  ASSERT_FALSE(tray_view()->visible());
+  ASSERT_TRUE(tray_view()->visible());
 
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   default_view()->OnGestureEvent(&tap);
   EXPECT_TRUE(screen_orientation_controller->rotation_locked());
   EXPECT_TRUE(tray_view()->visible());
 
   maximize_mode_controller->EnableMaximizeModeWindowManager(false);
 }
 
@@ skipping 24 matching lines @@
 TEST_F(TrayRotationLockTest, LockUpdatedDuringDesctruction) {
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   DestroyTrayView();
   Shell::Get()->screen_orientation_controller()->ToggleUserRotationLock();
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
 }
 
 }  // namespace ash