mash: Partially migrate ScreenOrientationController to ash/common.

ash/content/display/screen_orientation_controller_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/display/screen_orientation_controller_chromeos.h"
 
 #include <memory>
 #include <vector>
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/display/display_info.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/content/shell_content_state.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/content/test_shell_content_state.h"
@@ skipping 268 matching lines @@
 
 // Tests that a rotation lock is removed when the setting window is hidden, and
 // that it is reapplied when the window becomes visible.
 TEST_F(ScreenOrientationControllerTest, VisibilityChangesLock) {
   std::unique_ptr<content::WebContents> content(CreateWebContents());
   std::unique_ptr<aura::Window> focus_window(CreateTestWindowInShellWithId(0));
   AttachAndActivateWebContents(content.get(), focus_window.get());
   delegate()->Lock(content.get(), blink::WebScreenOrientationLockLandscape);
   EXPECT_TRUE(RotationLocked());
 
-  aura::Window* window = content->GetNativeView();
+  WmWindow* window = WmWindowAura::Get(content->GetNativeView());
+  ScreenOrientationController* controller =
+      Shell::GetInstance()->screen_orientation_controller();
   window->Hide();
+  controller->OnWindowVisibilityChanging(window, false);

[jonross, 2016/07/11 19:48:13]

I'm a bit concerned that this is not being triggered

[msw, 2016/07/11 20:02:31]

Might be async WmWindow behavior, or a plumbing issue. Any tips?

[jonross, 2016/07/11 20:10:58]

ScreenOrientationController should become a listener of WmWindow once Lock is
called (line 296.) I'd look to see what's happening with WmWindow, to see if the
notification is being fired correctly.

[msw, 2016/07/11 21:53:10]

Thanks for pushing me to dig in; I'll need to implement
WmWindowObserver::OnWindowVisibilityChanged for this to work as it did; the
target visibility has updated before
WmWindowObserver::OnWindowVisibilityChanging is called... that should have ben
obvious to me earlier.

   EXPECT_FALSE(RotationLocked());
 
   window->Show();
+  controller->OnWindowVisibilityChanging(window, true);
   EXPECT_TRUE(RotationLocked());
 }
 
 // Tests that when a window is destroyed that its rotation lock is removed, and
 // window activations no longer change the lock
 TEST_F(ScreenOrientationControllerTest, WindowDestructionRemovesLock) {
   std::unique_ptr<content::WebContents> content(CreateWebContents());
   std::unique_ptr<aura::Window> focus_window1(CreateTestWindowInShellWithId(0));
   std::unique_ptr<aura::Window> focus_window2(CreateTestWindowInShellWithId(1));
 
@@ skipping 337 matching lines @@
 
   Shell::GetInstance()->screen_orientation_controller()->SetDisplayRotation(
       kNewRotation, display::Display::ROTATION_SOURCE_ACTIVE);
 
   EXPECT_EQ(
       kNewRotation,
       display_manager->GetDisplayInfo(kInternalDisplayId).GetActiveRotation());
 }
 
 }  // namespace ash