Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Unified Diff: ash/wm/maximize_mode/maximize_mode_controller_unittest.cc

Issue 2642853006: Remove the ash-enable-touch-view-testing flag (Closed)
Patch Set: Removing unnecessary test Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
index 18f000d3229f59ed5ea38d72c9b9cde4f77a5efa..d51e82db97dd6d3c5b53e846b23cf240a402244c 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
+++ b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
@@ -445,16 +445,6 @@ TEST_F(MaximizeModeControllerTest, VerticalHingeTest) {
}
}
-// Tests that CanEnterMaximizeMode returns false until a valid accelerometer
-// event has been received, and that it returns true afterwards.
-TEST_F(MaximizeModeControllerTest,
- CanEnterMaximizeModeRequiresValidAccelerometerUpdate) {
- // Should be false until an accelerometer event is sent.
- ASSERT_FALSE(maximize_mode_controller()->CanEnterMaximizeMode());
- OpenLidToAngle(90.0f);
- EXPECT_TRUE(maximize_mode_controller()->CanEnterMaximizeMode());
afakhry 2017/01/24 22:20:53 derat@ This test doesn't make sense anymore, and h
Daniel Erat 2017/01/24 22:23:28 i don't know the full background here, but since w
afakhry 2017/01/25 01:40:09 I filled https://bugs.chromium.org/p/chromium/issu
-}
-
// Tests that when an accelerometer event is received which has no keyboard that
// we enter maximize mode.
TEST_F(MaximizeModeControllerTest,
@@ -541,29 +531,4 @@ TEST_F(MaximizeModeControllerTest, VerticalHingeUnstableAnglesTest) {
}
}
-class MaximizeModeControllerSwitchesTest : public MaximizeModeControllerTest {
- public:
- MaximizeModeControllerSwitchesTest() {}
- ~MaximizeModeControllerSwitchesTest() override {}
-
- void SetUp() override {
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kAshEnableTouchViewTesting);
- MaximizeModeControllerTest::SetUp();
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MaximizeModeControllerSwitchesTest);
-};
-
-// Tests that when the command line switch for testing maximize mode is on, that
-// 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

Powered by Google App Engine
This is Rietveld 408576698