(fix landed) Reland of name MaximizeMode to TabletMode

ash/system/brightness/tray_brightness_unittest.cc

Index: ash/system/brightness/tray_brightness_unittest.cc
diff --git a/ash/system/brightness/tray_brightness_unittest.cc b/ash/system/brightness/tray_brightness_unittest.cc
index e1f4e086285dc9396e958d6601b096b4d40fcadb..3ae39da4ea7514c1ec8832021b9578335e65e9b6 100644
--- a/ash/system/brightness/tray_brightness_unittest.cc
+++ b/ash/system/brightness/tray_brightness_unittest.cc
@@ -10,7 +10,7 @@
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "ui/views/view.h"
 
 namespace ash {
@@ -44,26 +44,22 @@
   EXPECT_FALSE(tray->visible());
 }
 
-// Tests the construction of the default view while MaximizeMode is active.
+// Tests the construction of the default view while TabletMode is active.
 // The BrightnessView should be visible.
-TEST_F(TrayBrightnessTest, CreateDefaultViewDuringMaximizeMode) {
-  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
-      true);
+TEST_F(TrayBrightnessTest, CreateDefaultViewDuringTabletMode) {
+  Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(true);
   std::unique_ptr<views::View> tray(CreateDefaultView());
   EXPECT_TRUE(tray->visible());
-  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
-      false);
+  Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(false);
 }
 
-// Tests that the enabling of MaximizeMode affects a previously created
+// Tests that the enabling of TabletMode affects a previously created
 // BrightnessView, changing the visibility.
-TEST_F(TrayBrightnessTest, DefaultViewVisibilityChangesDuringMaximizeMode) {
+TEST_F(TrayBrightnessTest, DefaultViewVisibilityChangesDuringTabletMode) {
   std::unique_ptr<views::View> tray(CreateDefaultView());
-  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
-      true);
+  Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(true);
   EXPECT_TRUE(tray->visible());
-  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
-      false);
+  Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(false);
   EXPECT_FALSE(tray->visible());
 }
 
@@ -74,26 +70,22 @@
   EXPECT_TRUE(tray->visible());
 }
 
-// Tests that when the detailed view is created during MaximizeMode that its
+// Tests that when the detailed view is created during TabletMode that its
 // BrightnessView is visible.
-TEST_F(TrayBrightnessTest, CreateDetailedViewDuringMaximizeMode) {
-  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
-      true);
+TEST_F(TrayBrightnessTest, CreateDetailedViewDuringTabletMode) {
+  Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(true);
   std::unique_ptr<views::View> tray(CreateDetailedView());
   EXPECT_TRUE(tray->visible());
-  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
-      false);
+  Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(false);
 }
 
-// Tests that the enabling of MaximizeMode has no affect on the visibility of a
+// Tests that the enabling of TabletMode has no affect on the visibility of a
 // previously created BrightnessView that belongs to a detailed view.
-TEST_F(TrayBrightnessTest, DetailedViewVisibilityChangesDuringMaximizeMode) {
+TEST_F(TrayBrightnessTest, DetailedViewVisibilityChangesDuringTabletMode) {
   std::unique_ptr<views::View> tray(CreateDetailedView());
-  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
-      true);
+  Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(true);
   EXPECT_TRUE(tray->visible());
-  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
-      false);
+  Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(false);
   EXPECT_TRUE(tray->visible());
 }