Hook up TABLET_MODE switch to maximize_mode_controller

ash/wm/maximize_mode/maximize_mode_controller_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/wm/maximize_mode/maximize_mode_controller.h"
 
 #include <math.h>
 #include <utility>
 #include <vector>
 
@@ skipping 137 matching lines @@
 
   void CloseLid() {
     maximize_mode_controller()->LidEventReceived(false /* open */,
         maximize_mode_controller()->tick_clock_->NowTicks());
   }
 
   bool WasLidOpenedRecently() {
     return maximize_mode_controller()->WasLidOpenedRecently();
   }
 
+  void ToggleTabletMode(const bool on) {

[Daniel Erat, 2016/06/06 17:23:08]

nit: rename this to SetTabletMode (toggling would just reverse the current
state) and remove "const" from param

[jcliang, 2016/06/06 18:19:25]

Done.

+    maximize_mode_controller()->TabletModeEventReceived(
+        on, maximize_mode_controller()->tick_clock_->NowTicks());
+  }
+
+  bool IsTabletModeOn() {

[Daniel Erat, 2016/06/06 17:23:08]

i'd delete this method and the calls to it. checking the class's internal
members doesn't seem useful and makes it hard to change the class later; you
really just want to check that it's setting maximized mode correctly (which
you're already doing).

[jcliang, 2016/06/06 18:19:25]

Done.

+    return maximize_mode_controller()->tablet_mode_switch_is_on_;
+  }
+
   bool AreEventsBlocked() {
     return !!maximize_mode_controller()->event_blocker_.get();
   }
 
   base::UserActionTester* user_action_tester() { return &user_action_tester_; }
 
  private:
   base::SimpleTestTickClock* test_tick_clock_;
 
   // Tracks user action counts.
@@ skipping 91 matching lines @@
 
   // 1 second after lid open.
   AdvanceTickClock(base::TimeDelta::FromSeconds(1));
   EXPECT_TRUE(WasLidOpenedRecently());
 
   // 3 seconds after lid open.
   AdvanceTickClock(base::TimeDelta::FromSeconds(2));
   EXPECT_FALSE(WasLidOpenedRecently());
 }
 
+TEST_F(MaximizeModeControllerTest, TabletModeTransition) {
+  ASSERT_FALSE(IsTabletModeOn());
+
+  OpenLidToAngle(90.0f);
+  EXPECT_FALSE(IsMaximizeModeStarted());
+
+  OpenLidToAngle(355.0f);
+  EXPECT_FALSE(IsMaximizeModeStarted());

[Daniel Erat, 2016/06/06 17:23:07]

why didn't this trigger maximize mode? it is because not enough time had passed?

[jcliang, 2016/06/06 18:19:25]

I meant to trigger an unstable reading and make sure the state doesn't change.
I've added a HoldDeviceVertical() to make the intent clear.

+
+  ToggleTabletMode(true);
+  EXPECT_TRUE(IsTabletModeOn());
+  EXPECT_TRUE(IsMaximizeModeStarted());
+
+  ToggleTabletMode(false);
+  EXPECT_FALSE(IsTabletModeOn());
+  EXPECT_TRUE(IsMaximizeModeStarted());
+
+  OpenLidToAngle(300.0f);
+  EXPECT_TRUE(IsMaximizeModeStarted());
+
+  OpenLidToAngle(90.0f);
+  EXPECT_FALSE(IsMaximizeModeStarted());
+}

[Daniel Erat, 2016/06/06 17:23:07]

can you open the lid to a large angle at the end of this test while the switch
is off (after advancing time, if necessary) to make sure that that still
triggers maximize mode?

[jcliang, 2016/06/06 18:19:25]

Done.

+
 // Verify the maximize mode enter/exit thresholds for stable angles.
 TEST_F(MaximizeModeControllerTest, StableHingeAnglesWithLidOpened) {
   ASSERT_FALSE(IsMaximizeModeStarted());
   ASSERT_FALSE(WasLidOpenedRecently());
 
   OpenLidToAngle(180.0f);
   EXPECT_FALSE(IsMaximizeModeStarted());
 
   OpenLidToAngle(315.0f);
   EXPECT_TRUE(IsMaximizeModeStarted());
@@ skipping 213 matching lines @@
 // accelerometer updates which would normally cause it to exit do not.
 TEST_F(MaximizeModeControllerSwitchesTest, IgnoreHingeAngles) {
   maximize_mode_controller()->EnableMaximizeModeWindowManager(true);
 
   // Would normally trigger an exit from maximize mode.
   OpenLidToAngle(90.0f);
   EXPECT_TRUE(IsMaximizeModeStarted());
 }
 
 }  // namespace ash