Eliminate ash::internal namespace

ash/wm/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/wm/workspace/workspace_layout_manager.h"
 
 #include "ash/display/display_layout.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
@@ skipping 353 matching lines @@
 }
 
 // Verifies a window created with maximized state has the maximized
 // bounds.
 TEST_F(WorkspaceLayoutManagerTest, MaximizeWithEmptySize) {
   scoped_ptr<aura::Window> window(
       aura::test::CreateTestWindowWithBounds(gfx::Rect(0, 0, 0, 0),
                                              NULL));
   wm::GetWindowState(window.get())->Maximize();
   aura::Window* default_container = Shell::GetContainer(
-      Shell::GetPrimaryRootWindow(),
-      internal::kShellWindowId_DefaultContainer);
+      Shell::GetPrimaryRootWindow(), kShellWindowId_DefaultContainer);
   default_container->AddChild(window.get());
   window->Show();
   gfx::Rect work_area(
       Shell::GetScreen()->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);
@@ skipping 125 matching lines @@
 
 class WorkspaceLayoutManagerSoloTest : public test::AshTestBase {
  public:
   WorkspaceLayoutManagerSoloTest() {}
   virtual ~WorkspaceLayoutManagerSoloTest() {}
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
     UpdateDisplay("800x600");
     aura::Window* default_container = Shell::GetContainer(
-        Shell::GetPrimaryRootWindow(),
-        internal::kShellWindowId_DefaultContainer);
-    default_container->SetLayoutManager(new internal::WorkspaceLayoutManager(
-        Shell::GetPrimaryRootWindow()));
+        Shell::GetPrimaryRootWindow(), kShellWindowId_DefaultContainer);
+    default_container->SetLayoutManager(
+        new WorkspaceLayoutManager(Shell::GetPrimaryRootWindow()));
   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
     return CreateTestWindowInShellWithBounds(bounds);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManagerSoloTest);
 };
 
@@ skipping 212 matching lines @@
 }
 
 // Verify if the window is not resized during screen lock. See: crbug.com/173127
 TEST_F(WorkspaceLayoutManagerSoloTest, NotResizeWhenScreenIsLocked) {
   SetCanLockScreen(true);
   scoped_ptr<aura::Window> window(CreateTestWindow(gfx::Rect(1, 2, 3, 4)));
   // window with AlwaysOnTop will be managed by BaseLayoutManager.
   window->SetProperty(aura::client::kAlwaysOnTopKey, true);
   window->Show();
 
-  internal::ShelfLayoutManager* shelf =
-      internal::ShelfLayoutManager::ForShelf(window.get());
+  ShelfLayoutManager* shelf = ShelfLayoutManager::ForShelf(window.get());
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
 
   window->SetBounds(ScreenUtil::GetMaximizedWindowBoundsInParent(window.get()));
   gfx::Rect window_bounds = window->bounds();
   EXPECT_EQ(
       ScreenUtil::GetMaximizedWindowBoundsInParent(window.get()).ToString(),
       window_bounds.ToString());
 
   Shell::GetInstance()->session_state_delegate()->LockScreen();
   shelf->UpdateVisibilityState();
@@ skipping 11 matching lines @@
 namespace {
 
 class WorkspaceLayoutManagerBackdropTest : public test::AshTestBase {
  public:
   WorkspaceLayoutManagerBackdropTest() {}
   virtual ~WorkspaceLayoutManagerBackdropTest() {}
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
     UpdateDisplay("800x600");
-    default_container_ = Shell::GetContainer(
-        Shell::GetPrimaryRootWindow(),
-        internal::kShellWindowId_DefaultContainer);
+    default_container_ = Shell::GetContainer(Shell::GetPrimaryRootWindow(),
+                                             kShellWindowId_DefaultContainer);
     // We set the size to something smaller then the display to avoid resizing
     // issues with the shelf.
     default_container_->SetBounds(gfx::Rect(0, 0, 800, 500));
   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
     aura::Window* window = CreateTestWindowInShellWithBounds(bounds);
     return window;
   }
 
   // Turn the top window back drop on / off.
   void ShowTopWindowBackdrop(bool show) {
-    scoped_ptr<ash::internal::WorkspaceLayoutManagerDelegate> backdrop;
+    scoped_ptr<ash::WorkspaceLayoutManagerDelegate> backdrop;
     if (show) {
-      backdrop.reset(new ash::internal::WorkspaceBackdropDelegate(
-          default_container_));
+      backdrop.reset(new ash::WorkspaceBackdropDelegate(default_container_));
     }
-    (static_cast<internal::WorkspaceLayoutManager*>
-        (default_container_->layout_manager()))->SetMaximizeBackdropDelegate(
-            backdrop.Pass());
+    (static_cast<WorkspaceLayoutManager*>(default_container_->layout_manager()))
+        ->SetMaximizeBackdropDelegate(backdrop.Pass());
     // Closing and / or opening can be a delayed operation.
     base::MessageLoop::current()->RunUntilIdle();
   }
 
   // Return the default container.
   aura::Window* default_container() { return default_container_; }
 
   // Return the order of windows (top most first) as they are in the default
   // container. If the window is visible it will be a big letter, otherwise a
   // small one. The backdrop will be an X and unknown windows will be shown as
@@ skipping 117 matching lines @@
   EXPECT_EQ("b,x",
             GetWindowOrderAsString(backdrop, window1.get(), window2.get(),
                                    window3.get()));
   ShowTopWindowBackdrop(false);
   EXPECT_EQ("b",
             GetWindowOrderAsString(NULL, window1.get(), window2.get(),
                                    window3.get()));
 }
 
 }  // namespace ash