Move Screen Rotation from MaximizeModeController to ScreenOrientationController

ash/content/display/screen_orientation_delegate_chromeos_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/ash_switches.h"
 #include "ash/content/display/screen_orientation_delegate_chromeos.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"

[flackr, 2014/11/27 15:39:15]

Obsolete?

[jonross, 2014/12/10 17:57:30]

Yup, removed.

 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_context.h"
 #include "third_party/WebKit/public/platform/WebScreenOrientationLockType.h"
 #include "ui/gfx/display.h"
 #include "ui/views/test/webview_test_helper.h"
 #include "ui/views/view.h"
 #include "ui/views/views_delegate.h"
 
 namespace ash {
 
 namespace {
 
 gfx::Display::Rotation Rotation() {
   return Shell::GetInstance()
       ->display_manager()
       ->GetDisplayInfo(gfx::Display::InternalDisplayId())
       .rotation();
 }
 
 bool RotationLocked() {
-  return Shell::GetInstance()->maximize_mode_controller()->rotation_locked();
+  return Shell::GetInstance()->screen_orientation_delegate()->rotation_locked();
 }
 
 }  // namespace
 
 class ScreenOrientationDelegateTest : public test::AshTestBase {
  public:
   ScreenOrientationDelegateTest();
   virtual ~ScreenOrientationDelegateTest();
 
   ScreenOrientationDelegate* delegate() { return screen_orientation_delegate_; }
@@ skipping 91 matching lines @@
   EXPECT_EQ(gfx::Display::ROTATE_90, Rotation());
   EXPECT_TRUE(RotationLocked());
 
   delegate()->Lock(content.get(), blink::WebScreenOrientationLockLandscape);
   EXPECT_EQ(gfx::Display::ROTATE_0, Rotation());
 }
 
 // Tests that a user initiated rotation lock cannot be unlocked by a
 // content::WebContents.
 TEST_F(ScreenOrientationDelegateTest, UserLockRejectsUnlock) {
-  Shell::GetInstance()->maximize_mode_controller()->SetRotationLocked(true);
+  delegate()->SetRotationLocked(true);
 
   scoped_ptr<content::WebContents> content(CreateWebContents());
   delegate()->Unlock(content.get());
   EXPECT_TRUE(RotationLocked());
 }
 
 // Tests that orientation can only be set by the first content::WebContents that
 // has set a rotation lock.
 TEST_F(ScreenOrientationDelegateTest, SecondContentCannotChangeOrientation) {
   scoped_ptr<content::WebContents> content1(CreateWebContents());
@@ skipping 25 matching lines @@
   ASSERT_NE(content1->GetNativeView(), content2->GetNativeView());
 
   delegate()->Lock(content1.get(), blink::WebScreenOrientationLockLandscape);
   delegate()->Unlock(content1.get());
   delegate()->Lock(content2.get(), blink::WebScreenOrientationLockPortrait);
   EXPECT_EQ(gfx::Display::ROTATE_90, Rotation());
   EXPECT_TRUE(RotationLocked());
 }
 
 }  // namespace ash