Revert 270746 "Suppressed screen rotation notifications triggere..."

trunk/src/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 "ash/accelerometer/accelerometer_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_lock_state_controller_delegate.h"
 #include "ash/test/test_screenshot_delegate.h"
-#include "ash/test/test_system_tray_delegate.h"
 #include "ash/test/test_volume_control_delegate.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/vector3d_f.h"
-#include "ui/message_center/message_center.h"
 
 namespace ash {
 
 namespace {
 
 const float kDegreesToRadians = 3.14159265f / 180.0f;
 
 // Filter to count the number of events seen.
 class EventCounter : public ui::EventHandler {
  public:
@@ skipping 76 matching lines @@
 
   bool IsMaximizeModeStarted() const {
     return Shell::GetInstance()->IsMaximizeModeWindowManagerEnabled();
   }
 
   gfx::Display::Rotation GetInternalDisplayRotation() const {
     return Shell::GetInstance()->display_manager()->GetDisplayInfo(
         gfx::Display::InternalDisplayId()).rotation();
   }
 
-  void SetInternalDisplayRotation(gfx::Display::Rotation rotation) const {
-    Shell::GetInstance()->display_manager()->
-        SetDisplayRotation(gfx::Display::InternalDisplayId(), rotation);
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(MaximizeModeControllerTest);
 };
 
 // Tests that opening the lid beyond 180 will enter touchview, and that it will
 // exit when the lid comes back from 180. Also tests the thresholds, i.e. it
 // will stick to the current mode.
 TEST_F(MaximizeModeControllerTest, EnterExitThresholds) {
   // For the simple test the base remains steady.
   gfx::Vector3dF base(0.0f, 0.0f, 1.0f);
@@ skipping 20 matching lines @@
   EXPECT_TRUE(IsMaximizeModeStarted());
 
   // Open 90 degrees.
   TriggerAccelerometerUpdate(base, gfx::Vector3dF(-1.0f, 0.0f, 0.0f));
   EXPECT_FALSE(IsMaximizeModeStarted());
 }
 
 // Tests that when the hinge is nearly vertically aligned, the current state
 // persists as the computed angle is highly inaccurate in this orientation.
 TEST_F(MaximizeModeControllerTest, HingeAligned) {
-  // Laptop in normal orientation lid open 90 degrees.
+   // Laptop in normal orientation lid open 90 degrees.
   TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 0.0f, 1.0f),
                              gfx::Vector3dF(-1.0f, 0.0f, 0.0f));
   EXPECT_FALSE(IsMaximizeModeStarted());
 
   // Completely vertical.
   TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, -1.0f, 0.0f),
                              gfx::Vector3dF(0.0f, -1.0f, 0.0f));
   EXPECT_FALSE(IsMaximizeModeStarted());
 
   // Close to vertical but with hinge appearing to be open 270 degrees.
@@ skipping 165 matching lines @@
 
   event_generator.ScrollSequence(
       gfx::Point(), base::TimeDelta::FromMilliseconds(5), 0, 100, 5, 2);
   EXPECT_EQ(0u, counter.event_count());
   counter.reset();
 
   event_generator.MoveMouseWheel(0, 10);
   EXPECT_EQ(0u, counter.event_count());
   counter.reset();
 
-  // Touch should not be blocked.
+ // Touch should not be blocked.
   event_generator.PressTouch();
   event_generator.ReleaseTouch();
   EXPECT_GT(counter.event_count(), 0u);
   counter.reset();
 
   gfx::Vector3dF base;
 
   // Lid open 90 degrees.
   TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 0.0f, 1.0f),
                              gfx::Vector3dF(-1.0f, 0.0f, 0.0f));
@@ skipping 144 matching lines @@
 
   // Open 90 degrees.
   TriggerAccelerometerUpdate(base, gfx::Vector3dF(-1.0f, 0.0f, 0.0f));
   EXPECT_FALSE(IsMaximizeModeStarted());
 
   // Send an update that would not relaunch MaximizeMode. 90 degrees.
   TriggerAccelerometerUpdate(base, gfx::Vector3dF(-1.0f, 0.0f, 0.0f));
   EXPECT_FALSE(maximize_mode_controller()->rotation_locked());
 }
 
-// Tests that the screen rotation notifications are suppressed when
-// triggered by the accelerometer.
-TEST_F(MaximizeModeControllerTest, BlockRotationNotifications) {
-  test::TestSystemTrayDelegate* tray_delegate =
-      static_cast<test::TestSystemTrayDelegate*>(
-          Shell::GetInstance()->system_tray_delegate());
-  tray_delegate->set_should_show_display_notification(true);
-
-  message_center::MessageCenter* message_center =
-      message_center::MessageCenter::Get();
-
-  // Make sure notifications are still displayed when
-  // adjusting the screen rotation directly when not in maximize mode
-  ASSERT_FALSE(IsMaximizeModeStarted());
-  ASSERT_NE(gfx::Display::ROTATE_180, GetInternalDisplayRotation());
-  ASSERT_EQ(0u, message_center->NotificationCount());
-  ASSERT_FALSE(message_center->HasPopupNotifications());
-  SetInternalDisplayRotation(gfx::Display::ROTATE_180);
-  EXPECT_EQ(gfx::Display::ROTATE_180, GetInternalDisplayRotation());
-  EXPECT_EQ(1u, message_center->NotificationCount());
-  EXPECT_TRUE(message_center->HasPopupNotifications());
-
-  // Reset the screen rotation.
-  SetInternalDisplayRotation(gfx::Display::ROTATE_0);
-  // Clear all notifications
-  message_center->RemoveAllNotifications(false);
-  // Trigger maximize mode by opening to 270.
-  TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 0.0f, -1.0f),
-                             gfx::Vector3dF(-1.0f, 0.0f, 0.0f));
-  EXPECT_TRUE(IsMaximizeModeStarted());
-  EXPECT_EQ(0u, message_center->NotificationCount());
-  EXPECT_FALSE(message_center->HasPopupNotifications());
-
-  // Make sure notifications are still displayed when
-  // adjusting the screen rotation directly when in maximize mode
-  ASSERT_NE(gfx::Display::ROTATE_270, GetInternalDisplayRotation());
-  SetInternalDisplayRotation(gfx::Display::ROTATE_270);
-  EXPECT_EQ(gfx::Display::ROTATE_270, GetInternalDisplayRotation());
-  EXPECT_EQ(1u, message_center->NotificationCount());
-  EXPECT_TRUE(message_center->HasPopupNotifications());
-
-  // Clear all notifications
-  message_center->RemoveAllNotifications(false);
-  EXPECT_EQ(0u, message_center->NotificationCount());
-  EXPECT_FALSE(message_center->HasPopupNotifications());
-
-  // Make sure notifications are blocked when adjusting the screen rotation
-  // via the accelerometer while in maximize mode
-  // Rotate the screen 90 degrees
-  ASSERT_NE(gfx::Display::ROTATE_90, GetInternalDisplayRotation());
-  TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 1.0f, 0.0f),
-                             gfx::Vector3dF(0.0f, 1.0f, 0.0f));
-  ASSERT_EQ(gfx::Display::ROTATE_90, GetInternalDisplayRotation());
-  EXPECT_EQ(0u, message_center->NotificationCount());
-  EXPECT_FALSE(message_center->HasPopupNotifications());
-}
-
 }  // namespace ash