chromeos: Converts WorkspaceLayoutManager to aura::LayoutManager

ash/wm/always_on_top_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/always_on_top_controller.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 19 matching lines @@
         keyboard::switches::kEnableVirtualKeyboard);
     test::AshTestBase::SetUp();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardAlwaysOnTopControllerTest);
 };
 
 class TestLayoutManager : public WorkspaceLayoutManager {
  public:
-  explicit TestLayoutManager(WmWindow* window)
+  explicit TestLayoutManager(aura::Window* window)
       : WorkspaceLayoutManager(window), keyboard_bounds_changed_(false) {}
 
   ~TestLayoutManager() override {}
 
   void OnKeyboardBoundsChanging(const gfx::Rect& bounds) override {
     keyboard_bounds_changed_ = true;
     WorkspaceLayoutManager::OnKeyboardBoundsChanging(bounds);
   }
 
   bool keyboard_bounds_changed() const { return keyboard_bounds_changed_; }
 
  private:
   bool keyboard_bounds_changed_;
   DISALLOW_COPY_AND_ASSIGN(TestLayoutManager);
 };
 
 // Verifies that the always on top controller is notified of keyboard bounds
 // changing events.
 TEST_F(VirtualKeyboardAlwaysOnTopControllerTest, NotifyKeyboardBoundsChanged) {
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   aura::Window* always_on_top_container =
       Shell::GetContainer(root_window, kShellWindowId_AlwaysOnTopContainer);
   // Install test layout manager.
-  TestLayoutManager* manager =
-      new TestLayoutManager(WmWindow::Get(always_on_top_container));
+  TestLayoutManager* manager = new TestLayoutManager(always_on_top_container);
   RootWindowController* controller = Shell::GetPrimaryRootWindowController();
   // Deactivates keyboard to unregister existing listeners.
   controller->DeactivateKeyboard(keyboard_controller);
   AlwaysOnTopController* always_on_top_controller =
       controller->always_on_top_controller();
   always_on_top_controller->SetLayoutManagerForTest(base::WrapUnique(manager));
   // Activate keyboard. This triggers keyboard listeners to be registered.
   controller->ActivateKeyboard(keyboard_controller);
 
   // Mock a keyboard appearing.
@@ skipping 10 matching lines @@
       root_window->bounds(), kKeyboardHeight);
   keyboard_window->SetBounds(keyboard_bounds);
   keyboard_window->Show();
   keyboard_controller->NotifyKeyboardBoundsChanging(keyboard_bounds);
   // Verify that test manager was notified of bounds change.
   ASSERT_TRUE(manager->keyboard_bounds_changed());
 }
 
 }  // namespace test
 }  // namespace ash