Moves mash/wm into ash/mus

ash/mus/workspace/workspace_layout_manager_unittest.cc

 // Copyright (c) 2012 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/common/wm/workspace/workspace_layout_manager.h"
 
 #include <string>
 #include <utility>
 
 #include "ash/common/wm/fullscreen_window_finder.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_root_window_controller_observer.h"
 #include "ash/common/wm/wm_screen_util.h"
+#include "ash/mus/bridge/wm_root_window_controller_mus.h"
+#include "ash/mus/bridge/wm_window_mus.h"
+#include "ash/mus/test/wm_test_base.h"
 #include "components/mus/public/cpp/tests/test_window.h"
-#include "mash/wm/bridge/wm_root_window_controller_mus.h"
-#include "mash/wm/bridge/wm_window_mus.h"
-#include "mash/wm/test/wm_test_base.h"
 #include "ui/display/display.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 namespace {
 
 // TODO(sky): no tests for multiple displays yet: http://crbug.com/612627.
 /*
 class MaximizeDelegateView : public views::WidgetDelegateView {
  public:
   explicit MaximizeDelegateView(const gfx::Rect& initial_bounds)
       : initial_bounds_(initial_bounds) {
   }
   ~MaximizeDelegateView() override {}
 
   bool GetSavedWindowPlacement(const views::Widget* widget,
                                gfx::Rect* bounds,
                                ui::WindowShowState* show_state) const override {
     *bounds = initial_bounds_;
     *show_state = ui::SHOW_STATE_MAXIMIZED;
     return true;
   }
 
  private:
   const gfx::Rect initial_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(MaximizeDelegateView);
 };
 */
 
-class FullscreenObserver : public ash::wm::WmRootWindowControllerObserver {
+class FullscreenObserver : public wm::WmRootWindowControllerObserver {
  public:
   explicit FullscreenObserver(
-      ash::wm::WmRootWindowController* root_window_controller)
+      wm::WmRootWindowController* root_window_controller)
       : root_window_controller_(root_window_controller),
         call_count_(0),
         is_fullscreen_(false) {
     root_window_controller_->AddObserver(this);
   }
 
   ~FullscreenObserver() override {
     root_window_controller_->RemoveObserver(this);
   }
 
   void OnFullscreenStateChanged(bool is_fullscreen) override {
     call_count_++;
     is_fullscreen_ = is_fullscreen;
   }
 
   int call_count() const { return call_count_; }
 
   bool is_fullscreen() const { return is_fullscreen_; }
 
  private:
-  ash::wm::WmRootWindowController* root_window_controller_;
+  wm::WmRootWindowController* root_window_controller_;
   int call_count_;
   bool is_fullscreen_;
 
   DISALLOW_COPY_AND_ASSIGN(FullscreenObserver);
 };
 
 }  // namespace
 
 using WorkspaceLayoutManagerTest = WmTestBase;
 
 // Verifies that a window containing a restore coordinate will be restored to
 // to the size prior to minimize, keeping the restore rectangle in tact (if
 // there is one).
 TEST_F(WorkspaceLayoutManagerTest, RestoreFromMinimizeKeepsRestore) {
-  mus::Window* mus_window = CreateTestWindow(gfx::Rect(1, 2, 3, 4));
-  ash::wm::WmWindow* window = WmWindowMus::Get(mus_window);
+  ::mus::Window* mus_window = CreateTestWindow(gfx::Rect(1, 2, 3, 4));
+  wm::WmWindow* window = WmWindowMus::Get(mus_window);
   gfx::Rect bounds(10, 15, 25, 35);
   window->SetBounds(bounds);
 
-  ash::wm::WindowState* window_state = window->GetWindowState();
+  wm::WindowState* window_state = window->GetWindowState();
 
   // This will not be used for un-minimizing window.
   window_state->SetRestoreBoundsInScreen(gfx::Rect(0, 0, 100, 100));
   window_state->Minimize();
   window_state->Restore();
   EXPECT_EQ("0,0 100x100", window_state->GetRestoreBoundsInScreen().ToString());
   EXPECT_EQ("10,15 25x35", mus_window->bounds().ToString());
 
   if (!SupportsMultipleDisplays())
     return;
@@ skipping 38 matching lines @@
       CreateTestWindowInShellWithBounds(gfx::Rect(10, -600, 200, 200)));
   EXPECT_EQ("10,-500 200x200", window2->GetBoundsInScreen().ToString());
 }
 */
 
 TEST_F(WorkspaceLayoutManagerTest, NoMinimumVisibilityForPopupWindows) {
   UpdateDisplay("300x400");
 
   // Create a popup window out of display boundaries and make sure it is not
   // moved to have minimum visibility.
-  mus::Window* mus_window =
+  ::mus::Window* mus_window =
       CreateTestWindow(gfx::Rect(400, 100, 50, 50), ui::wm::WINDOW_TYPE_POPUP);
   WmWindowMus* window = WmWindowMus::Get(mus_window);
   EXPECT_EQ("400,100 50x50", window->GetBoundsInScreen().ToString());
 }
 
 /*
 TEST_F(WorkspaceLayoutManagerTest, KeepRestoredWindowInDisplay) {
   if (!SupportsHostWindowResize())
     return;
   std::unique_ptr<aura::Window> window(
@@ skipping 181 matching lines @@
   window_observer.set_window(window2.get());
   window_state->Maximize();
   EXPECT_EQ("10,20 30x40",
             window_state->GetRestoreBoundsInScreen().ToString());
   window->RemoveObserver(&window_observer);
 }
 */
 
 // Verifies when a window is maximized all descendant windows have a size.
 TEST_F(WorkspaceLayoutManagerTest, ChildBoundsResetOnMaximize) {
-  mus::Window* mus_window = CreateTestWindow(gfx::Rect(10, 20, 30, 40));
-  ash::wm::WmWindow* window = WmWindowMus::Get(mus_window);
+  ::mus::Window* mus_window = CreateTestWindow(gfx::Rect(10, 20, 30, 40));
+  wm::WmWindow* window = WmWindowMus::Get(mus_window);
 
-  ash::wm::WindowState* window_state = window->GetWindowState();
+  wm::WindowState* window_state = window->GetWindowState();
   window_state->Activate();
-  mus::Window* child_window =
+  ::mus::Window* child_window =
       CreateChildTestWindow(mus_window, gfx::Rect(5, 6, 7, 8));
   window_state->Maximize();
   EXPECT_EQ("5,6 7x8", child_window->bounds().ToString());
 }
 
 // Verifies a window created with maximized state has the maximized
 // bounds.
 TEST_F(WorkspaceLayoutManagerTest, MaximizeWithEmptySize) {
-  mus::Window* mus_window = CreateTestWindow(gfx::Rect());
+  ::mus::Window* mus_window = CreateTestWindow(gfx::Rect());
   WmWindowMus* window = WmWindowMus::Get(mus_window);
   window->GetWindowState()->Maximize();
   gfx::Rect work_area(GetPrimaryDisplay().work_area());
   EXPECT_EQ(work_area.ToString(), window->GetBoundsInScreen().ToString());
 }
 
 TEST_F(WorkspaceLayoutManagerTest, WindowShouldBeOnScreenWhenAdded) {
   // Normal window bounds shouldn't be changed.
   gfx::Rect window_bounds(100, 100, 200, 200);
-  mus::Window* mus_window = CreateTestWindow(window_bounds);
-  ash::wm::WmWindow* window = WmWindowMus::Get(mus_window);
+  ::mus::Window* mus_window = CreateTestWindow(window_bounds);
+  wm::WmWindow* window = WmWindowMus::Get(mus_window);
   EXPECT_EQ(window_bounds, mus_window->bounds());
 
   // If the window is out of the workspace, it would be moved on screen.
   gfx::Rect root_window_bounds = GetPrimaryRootWindow()->bounds();
   window_bounds.Offset(root_window_bounds.width(), root_window_bounds.height());
   ASSERT_FALSE(window_bounds.Intersects(root_window_bounds));
-  mus::Window* out_mus_window = CreateTestWindow(window_bounds);
-  ash::wm::WmWindow* out_window = WmWindowMus::Get(out_mus_window);
+  ::mus::Window* out_mus_window = CreateTestWindow(window_bounds);
+  wm::WmWindow* out_window = WmWindowMus::Get(out_mus_window);
   EXPECT_EQ(window_bounds.size(), out_mus_window->bounds().size());
   gfx::Rect bounds = out_mus_window->bounds();
   bounds.Intersect(root_window_bounds);
 
   // 30% of the window edge must be visible.
   EXPECT_GT(bounds.width(), out_mus_window->bounds().width() * 0.29);
   EXPECT_GT(bounds.height(), out_mus_window->bounds().height() * 0.29);
 
-  mus::Window* mus_parent = out_mus_window->parent();
+  ::mus::Window* mus_parent = out_mus_window->parent();
   mus_parent->RemoveChild(out_mus_window);
   out_window->SetBounds(gfx::Rect(-200, -200, 200, 200));
   // UserHasChangedWindowPositionOrSize flag shouldn't turn off this behavior.
   window->GetWindowState()->set_bounds_changed_by_user(true);
   mus_parent->AddChild(out_mus_window);
   EXPECT_GT(bounds.width(), out_mus_window->bounds().width() * 0.29);
   EXPECT_GT(bounds.height(), out_mus_window->bounds().height() * 0.29);
 
   // Make sure we always make more than 1/3 of the window edge visible even
   // if the initial bounds intersects with display.
   window_bounds.SetRect(-150, -150, 200, 200);
   bounds = window_bounds;
   bounds.Intersect(root_window_bounds);
 
   // Make sure that the initial bounds' visible area is less than 26%
   // so that the auto adjustment logic kicks in.
   ASSERT_LT(bounds.width(), out_mus_window->bounds().width() * 0.26);
   ASSERT_LT(bounds.height(), out_mus_window->bounds().height() * 0.26);
   ASSERT_TRUE(window_bounds.Intersects(root_window_bounds));
 
-  mus::Window* partially_out_mus_window = CreateTestWindow(window_bounds);
+  ::mus::Window* partially_out_mus_window = CreateTestWindow(window_bounds);
   EXPECT_EQ(window_bounds.size(), partially_out_mus_window->bounds().size());
   bounds = partially_out_mus_window->bounds();
   bounds.Intersect(root_window_bounds);
   EXPECT_GT(bounds.width(), out_mus_window->bounds().width() * 0.29);
   EXPECT_GT(bounds.height(), out_mus_window->bounds().height() * 0.29);
 
   // Make sure the window whose 30% width/height is bigger than display
   // will be placed correctly.
   window_bounds.SetRect(-1900, -1900, 3000, 3000);
-  mus::Window* mus_window_bigger_than_display = CreateTestWindow(window_bounds);
+  ::mus::Window* mus_window_bigger_than_display =
+      CreateTestWindow(window_bounds);
   EXPECT_GE(root_window_bounds.width(),
             mus_window_bigger_than_display->bounds().width());
   EXPECT_GE(root_window_bounds.height(),
             mus_window_bigger_than_display->bounds().height());
 
   bounds = mus_window_bigger_than_display->bounds();
   bounds.Intersect(root_window_bounds);
   EXPECT_GT(bounds.width(), out_mus_window->bounds().width() * 0.29);
   EXPECT_GT(bounds.height(), out_mus_window->bounds().height() * 0.29);
 }
 
 // Verifies the size of a window is enforced to be smaller than the work area.
 TEST_F(WorkspaceLayoutManagerTest, SizeToWorkArea) {
   // Normal window bounds shouldn't be changed.
   gfx::Size work_area(GetPrimaryDisplay().work_area().size());
   const gfx::Rect window_bounds(100, 101, work_area.width() + 1,
                                 work_area.height() + 2);
-  mus::Window* window = CreateTestWindow(window_bounds);
+  ::mus::Window* window = CreateTestWindow(window_bounds);
   EXPECT_EQ(gfx::Rect(gfx::Point(100, 101), work_area).ToString(),
             window->bounds().ToString());
 
   // Directly setting the bounds triggers a slightly different code path. Verify
   // that too.
   WmWindowMus::Get(window)->SetBounds(window_bounds);
   EXPECT_EQ(gfx::Rect(gfx::Point(100, 101), work_area).ToString(),
             window->bounds().ToString());
 }
 
 TEST_F(WorkspaceLayoutManagerTest, NotifyFullscreenChanges) {
   FullscreenObserver observer(
       WmWindowMus::Get(GetPrimaryRootWindow())->GetRootWindowController());
-  mus::Window* window1 = CreateTestWindow(gfx::Rect(1, 2, 30, 40));
-  mus::Window* window2 = CreateTestWindow(gfx::Rect(1, 2, 30, 40));
-  ash::wm::WindowState* window_state1 =
-      WmWindowMus::Get(window1)->GetWindowState();
-  ash::wm::WindowState* window_state2 =
-      WmWindowMus::Get(window2)->GetWindowState();
+  ::mus::Window* window1 = CreateTestWindow(gfx::Rect(1, 2, 30, 40));
+  ::mus::Window* window2 = CreateTestWindow(gfx::Rect(1, 2, 30, 40));
+  wm::WindowState* window_state1 = WmWindowMus::Get(window1)->GetWindowState();
+  wm::WindowState* window_state2 = WmWindowMus::Get(window2)->GetWindowState();
   window_state2->Activate();
 
-  const ash::wm::WMEvent toggle_fullscreen_event(
-      ash::wm::WM_EVENT_TOGGLE_FULLSCREEN);
+  const wm::WMEvent toggle_fullscreen_event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
   window_state2->OnWMEvent(&toggle_fullscreen_event);
   EXPECT_EQ(1, observer.call_count());
   EXPECT_TRUE(observer.is_fullscreen());
 
   // When window1 moves to the front the fullscreen state should change.
   window_state1->Activate();
   EXPECT_EQ(2, observer.call_count());
   EXPECT_FALSE(observer.is_fullscreen());
 
   // It should change back if window2 becomes active again.
@@ skipping 13 matching lines @@
   window2->Destroy();
   EXPECT_EQ(6, observer.call_count());
   EXPECT_FALSE(observer.is_fullscreen());
 }
 // Following "Solo" tests were originally written for BaseLayoutManager.
 using WorkspaceLayoutManagerSoloTest = WmTestBase;
 
 // Tests normal->maximize->normal.
 TEST_F(WorkspaceLayoutManagerSoloTest, Maximize) {
   gfx::Rect bounds(100, 100, 200, 200);
-  mus::Window* mus_window = CreateTestWindow(bounds);
-  ash::wm::WmWindow* window = WmWindowMus::Get(mus_window);
+  ::mus::Window* mus_window = CreateTestWindow(bounds);
+  wm::WmWindow* window = WmWindowMus::Get(mus_window);
   window->SetShowState(ui::SHOW_STATE_MAXIMIZED);
   // Maximized window fills the work area, not the whole display.
-  EXPECT_EQ(ash::wm::GetMaximizedWindowBoundsInParent(window).ToString(),
+  EXPECT_EQ(wm::GetMaximizedWindowBoundsInParent(window).ToString(),
             mus_window->bounds().ToString());
   window->SetShowState(ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(bounds.ToString(), mus_window->bounds().ToString());
 }
 
 // Tests normal->minimize->normal.
 TEST_F(WorkspaceLayoutManagerSoloTest, Minimize) {
   gfx::Rect bounds(100, 100, 200, 200);
-  mus::Window* mus_window = CreateTestWindow(bounds);
-  ash::wm::WmWindow* window = WmWindowMus::Get(mus_window);
+  ::mus::Window* mus_window = CreateTestWindow(bounds);
+  wm::WmWindow* window = WmWindowMus::Get(mus_window);
   window->SetShowState(ui::SHOW_STATE_MINIMIZED);
   // Note: Currently minimize doesn't do anything except set the state.
   // See crbug.com/104571.
   EXPECT_EQ(bounds.ToString(), mus_window->bounds().ToString());
   window->SetShowState(ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(bounds.ToString(), mus_window->bounds().ToString());
 }
 
 // A WindowObserver which sets the focus when the window becomes visible.
-class FocusObserver : public mus::WindowObserver {
+class FocusObserver : public ::mus::WindowObserver {
  public:
-  explicit FocusObserver(mus::Window* window)
+  explicit FocusObserver(::mus::Window* window)
       : window_(window), show_state_(ui::SHOW_STATE_END) {
     window_->AddObserver(this);
   }
   ~FocusObserver() override { window_->RemoveObserver(this); }
 
   // aura::test::TestWindowDelegate overrides:
-  void OnWindowVisibilityChanged(mus::Window* window) override {
+  void OnWindowVisibilityChanged(::mus::Window* window) override {
     if (window_->visible())
       window_->SetFocus();
     show_state_ = WmWindowMus::Get(window_)->GetShowState();
   }
 
   ui::WindowShowState GetShowStateAndReset() {
     ui::WindowShowState ret = show_state_;
     show_state_ = ui::SHOW_STATE_END;
     return ret;
   }
 
  private:
-  mus::Window* window_;
+  ::mus::Window* window_;
   ui::WindowShowState show_state_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusObserver);
 };
 
 // Make sure that the window's show state is correct in
 // |mus::WindowObserver::OnWindowVisibilityChanged|, and setting
 // focus in this callback doesn't cause DCHECK error.  See
 // crbug.com/168383.
 // NOTE: this was adapted from the ash test of the same name, I suspect this
 // test isn't particularly useful for mash.
 TEST_F(WorkspaceLayoutManagerSoloTest, FocusDuringUnminimize) {
-  mus::Window* mus_window = CreateTestWindow(gfx::Rect(100, 100, 100, 100));
-  ash::wm::WmWindow* window = WmWindowMus::Get(mus_window);
+  ::mus::Window* mus_window = CreateTestWindow(gfx::Rect(100, 100, 100, 100));
+  wm::WmWindow* window = WmWindowMus::Get(mus_window);
   FocusObserver observer(mus_window);
   window->SetShowState(ui::SHOW_STATE_MINIMIZED);
   EXPECT_FALSE(window->IsVisible());
   EXPECT_EQ(ui::SHOW_STATE_MINIMIZED, observer.GetShowStateAndReset());
   window->Show();
   EXPECT_TRUE(window->IsVisible());
   EXPECT_EQ(ui::SHOW_STATE_NORMAL, observer.GetShowStateAndReset());
 }
 
 // Tests maximized window size during root window resize.
 TEST_F(WorkspaceLayoutManagerSoloTest, MaximizeRootWindowResize) {
   gfx::Rect bounds(100, 100, 200, 200);
-  mus::Window* mus_window = CreateTestWindow(bounds);
-  ash::wm::WmWindow* window = WmWindowMus::Get(mus_window);
+  ::mus::Window* mus_window = CreateTestWindow(bounds);
+  wm::WmWindow* window = WmWindowMus::Get(mus_window);
   window->SetShowState(ui::SHOW_STATE_MAXIMIZED);
   gfx::Rect initial_work_area_bounds =
-      ash::wm::GetMaximizedWindowBoundsInParent(window);
+      wm::GetMaximizedWindowBoundsInParent(window);
   EXPECT_EQ(initial_work_area_bounds.ToString(),
             mus_window->bounds().ToString());
   // Enlarge the root window.  We should still match the work area size.
   UpdateDisplay("900x700");
-  EXPECT_EQ(ash::wm::GetMaximizedWindowBoundsInParent(window).ToString(),
+  EXPECT_EQ(wm::GetMaximizedWindowBoundsInParent(window).ToString(),
             mus_window->bounds().ToString());
   EXPECT_NE(initial_work_area_bounds.ToString(),
-            ash::wm::GetMaximizedWindowBoundsInParent(window).ToString());
+            wm::GetMaximizedWindowBoundsInParent(window).ToString());
 }
 
 // Tests normal->fullscreen->normal.
 TEST_F(WorkspaceLayoutManagerSoloTest, Fullscreen) {
   gfx::Rect bounds(100, 100, 200, 200);
-  mus::Window* mus_window = CreateTestWindow(bounds);
-  ash::wm::WmWindow* window = WmWindowMus::Get(mus_window);
+  ::mus::Window* mus_window = CreateTestWindow(bounds);
+  wm::WmWindow* window = WmWindowMus::Get(mus_window);
   window->SetShowState(ui::SHOW_STATE_FULLSCREEN);
   // Fullscreen window fills the whole display.
   EXPECT_EQ(window->GetDisplayNearestWindow().bounds().ToString(),
             mus_window->bounds().ToString());
   window->SetShowState(ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(bounds.ToString(), mus_window->bounds().ToString());
 }
 
 // Tests that fullscreen window causes always_on_top windows to stack below.
 TEST_F(WorkspaceLayoutManagerSoloTest, FullscreenSuspendsAlwaysOnTop) {
   gfx::Rect bounds(100, 100, 200, 200);
-  mus::Window* mus_fullscreen_window = CreateTestWindow(bounds);
+  ::mus::Window* mus_fullscreen_window = CreateTestWindow(bounds);
   WmWindowMus* fullscreen_window = WmWindowMus::Get(mus_fullscreen_window);
-  mus::Window* mus_always_on_top_window1 = CreateTestWindow(bounds);
+  ::mus::Window* mus_always_on_top_window1 = CreateTestWindow(bounds);
   WmWindowMus* always_on_top_window1 =
       WmWindowMus::Get(mus_always_on_top_window1);
-  mus::Window* mus_always_on_top_window2 = CreateTestWindow(bounds);
+  ::mus::Window* mus_always_on_top_window2 = CreateTestWindow(bounds);
   WmWindowMus* always_on_top_window2 =
       WmWindowMus::Get(mus_always_on_top_window2);
   always_on_top_window1->SetAlwaysOnTop(true);
   always_on_top_window2->SetAlwaysOnTop(true);
   // Making a window fullscreen temporarily suspends always on top state.
   fullscreen_window->SetShowState(ui::SHOW_STATE_FULLSCREEN);
   EXPECT_FALSE(always_on_top_window1->IsAlwaysOnTop());
   EXPECT_FALSE(always_on_top_window2->IsAlwaysOnTop());
   EXPECT_TRUE(GetWindowForFullscreenMode(fullscreen_window));
   // Making fullscreen window normal restores always on top windows.
   fullscreen_window->SetShowState(ui::SHOW_STATE_NORMAL);
   EXPECT_TRUE(always_on_top_window1->IsAlwaysOnTop());
   EXPECT_TRUE(always_on_top_window2->IsAlwaysOnTop());
   EXPECT_FALSE(GetWindowForFullscreenMode(fullscreen_window));
 }
 
 // Tests fullscreen window size during root window resize.
 TEST_F(WorkspaceLayoutManagerSoloTest, FullscreenRootWindowResize) {
   gfx::Rect bounds(100, 100, 200, 200);
-  mus::Window* mus_window = CreateTestWindow(bounds);
-  ash::wm::WmWindow* window = WmWindowMus::Get(mus_window);
+  ::mus::Window* mus_window = CreateTestWindow(bounds);
+  wm::WmWindow* window = WmWindowMus::Get(mus_window);
   // Fullscreen window fills the whole display.
   window->SetShowState(ui::SHOW_STATE_FULLSCREEN);
   EXPECT_EQ(window->GetDisplayNearestWindow().bounds().ToString(),
             mus_window->bounds().ToString());
   // Enlarge the root window.  We should still match the display size.
   UpdateDisplay("1001x1201");
   EXPECT_EQ(window->GetDisplayNearestWindow().bounds().ToString(),
             mus_window->bounds().ToString());
 }
 
 // Tests that when the screen gets smaller the windows aren't bigger than
 // the screen.
 TEST_F(WorkspaceLayoutManagerSoloTest, RootWindowResizeShrinksWindows) {
-  mus::Window* mus_window = CreateTestWindow(gfx::Rect(10, 20, 500, 400));
-  ash::wm::WmWindow* window = WmWindowMus::Get(mus_window);
+  ::mus::Window* mus_window = CreateTestWindow(gfx::Rect(10, 20, 500, 400));
+  wm::WmWindow* window = WmWindowMus::Get(mus_window);
   gfx::Rect work_area = window->GetDisplayNearestWindow().work_area();
   // Invariant: Window is smaller than work area.
   EXPECT_LE(mus_window->bounds().width(), work_area.width());
   EXPECT_LE(mus_window->bounds().height(), work_area.height());
 
   // Make the root window narrower than our window.
   UpdateDisplay("300x400");
   work_area = window->GetDisplayNearestWindow().work_area();
   EXPECT_LE(mus_window->bounds().width(), work_area.width());
   EXPECT_LE(mus_window->bounds().height(), work_area.height());
 
   // Make the root window shorter than our window.
   UpdateDisplay("300x200");
   work_area = window->GetDisplayNearestWindow().work_area();
   EXPECT_LE(mus_window->bounds().width(), work_area.width());
   EXPECT_LE(mus_window->bounds().height(), work_area.height());
 
   // Enlarging the root window does not change the window bounds.
   gfx::Rect old_bounds = mus_window->bounds();
   UpdateDisplay("800x600");
   EXPECT_EQ(old_bounds.width(), mus_window->bounds().width());
   EXPECT_EQ(old_bounds.height(), mus_window->bounds().height());
 }
 
 // Verifies maximizing sets the restore bounds, and restoring
 // restores the bounds.
 TEST_F(WorkspaceLayoutManagerSoloTest, MaximizeSetsRestoreBounds) {
-  mus::Window* mus_window = CreateTestWindow(gfx::Rect(10, 20, 30, 40));
-  ash::wm::WmWindow* window = WmWindowMus::Get(mus_window);
-  ash::wm::WindowState* window_state = window->GetWindowState();
+  ::mus::Window* mus_window = CreateTestWindow(gfx::Rect(10, 20, 30, 40));
+  wm::WmWindow* window = WmWindowMus::Get(mus_window);
+  wm::WindowState* window_state = window->GetWindowState();
 
   // Maximize it, which will keep the previous restore bounds.
   window->SetShowState(ui::SHOW_STATE_MAXIMIZED);
   EXPECT_EQ("10,20 30x40", window_state->GetRestoreBoundsInParent().ToString());
 
   // Restore it, which should restore bounds and reset restore bounds.
   window->SetShowState(ui::SHOW_STATE_NORMAL);
   EXPECT_EQ("10,20 30x40", mus_window->bounds().ToString());
   EXPECT_FALSE(window_state->HasRestoreBounds());
 }
 
 // Verifies maximizing keeps the restore bounds if set.
 TEST_F(WorkspaceLayoutManagerSoloTest, MaximizeResetsRestoreBounds) {
-  mus::Window* mus_window = CreateTestWindow(gfx::Rect(1, 2, 3, 4));
-  ash::wm::WmWindow* window = WmWindowMus::Get(mus_window);
+  ::mus::Window* mus_window = CreateTestWindow(gfx::Rect(1, 2, 3, 4));
+  wm::WmWindow* window = WmWindowMus::Get(mus_window);
 
-  ash::wm::WindowState* window_state = window->GetWindowState();
+  wm::WindowState* window_state = window->GetWindowState();
   window_state->SetRestoreBoundsInParent(gfx::Rect(10, 11, 12, 13));
 
   // Maximize it, which will keep the previous restore bounds.
   window->SetShowState(ui::SHOW_STATE_MAXIMIZED);
   EXPECT_EQ("10,11 12x13", window_state->GetRestoreBoundsInParent().ToString());
 }
 
 // Verifies that the restore bounds do not get reset when restoring to a
 // maximzied state from a minimized state.
 TEST_F(WorkspaceLayoutManagerSoloTest,
        BoundsAfterRestoringToMaximizeFromMinimize) {
-  mus::Window* mus_window = CreateTestWindow(gfx::Rect(1, 2, 3, 4));
-  ash::wm::WmWindow* window = WmWindowMus::Get(mus_window);
+  ::mus::Window* mus_window = CreateTestWindow(gfx::Rect(1, 2, 3, 4));
+  wm::WmWindow* window = WmWindowMus::Get(mus_window);
   gfx::Rect bounds(10, 15, 25, 35);
   window->SetBounds(bounds);
 
-  ash::wm::WindowState* window_state = window->GetWindowState();
+  wm::WindowState* window_state = window->GetWindowState();
   // Maximize it, which should reset restore bounds.
   window_state->Maximize();
   EXPECT_EQ(bounds.ToString(),
             window_state->GetRestoreBoundsInParent().ToString());
   // Minimize the window. The restore bounds should not change.
   window_state->Minimize();
   EXPECT_EQ(bounds.ToString(),
             window_state->GetRestoreBoundsInParent().ToString());
 
   // Show the window again. The window should be maximized, and the restore
@@ skipping 374 matching lines @@
   EXPECT_EQ(gfx::Rect(50,
                       keyboard_bounds.y() - keyboard_bounds.height()/2,
                       occluded_window_bounds.width(),
                       occluded_window_bounds.height()).ToString(),
             window->bounds().ToString());
   HideKeyboard();
   EXPECT_EQ(occluded_window_bounds.ToString(), window->bounds().ToString());
 }
 */
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash