Eliminate ash::internal namespace

ash/wm/toplevel_window_event_handler_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/toplevel_window_event_handler.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 52 matching lines @@
   ToplevelWindowEventHandlerTest() {}
   virtual ~ToplevelWindowEventHandlerTest() {}
 
  protected:
   aura::Window* CreateWindow(int hittest_code) {
     TestWindowDelegate* d1 = new TestWindowDelegate(hittest_code);
     aura::Window* w1 = new aura::Window(d1);
     w1->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     w1->set_id(1);
     w1->Init(aura::WINDOW_LAYER_TEXTURED);
-    aura::Window* parent =
-      Shell::GetContainer(Shell::GetPrimaryRootWindow(),
-                          internal::kShellWindowId_AlwaysOnTopContainer);
+    aura::Window* parent = Shell::GetContainer(
+        Shell::GetPrimaryRootWindow(), kShellWindowId_AlwaysOnTopContainer);
     parent->AddChild(w1);
     w1->SetBounds(gfx::Rect(0, 0, 100, 100));
     w1->Show();
     return w1;
   }
 
   void DragFromCenterBy(aura::Window* window, int dx, int dy) {
     aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), window);
     generator.DragMouseBy(dx, dy);
   }
@@ skipping 384 matching lines @@
 
 // Tests that a gesture cannot minimize a window in login/lock screen.
 TEST_F(ToplevelWindowEventHandlerTest, GestureDragMinimizeLoginScreen) {
   LockStateController* state_controller =
       Shell::GetInstance()->lock_state_controller();
   state_controller->OnLoginStateChanged(user::LOGGED_IN_NONE);
   state_controller->OnLockStateChanged(false);
   SetUserLoggedIn(false);
 
   scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION));
-  aura::Window* lock = internal::RootWindowController::ForWindow(target.get())->
-      GetContainer(internal::kShellWindowId_LockSystemModalContainer);
+  aura::Window* lock =
+      RootWindowController::ForWindow(target.get())
+          ->GetContainer(kShellWindowId_LockSystemModalContainer);
   lock->AddChild(target.get());
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                        target.get());
   gfx::Rect old_bounds = target->bounds();
   gfx::Point location(5, 5);
   target->SetProperty(aura::client::kCanMaximizeKey, true);
 
   gfx::Point end = location;
   end.Offset(0, 100);
   generator.GestureScrollSequence(location, end,
@@ skipping 211 matching lines @@
 
   generator.ReleaseLeftButton();
   EXPECT_EQ("10,11 100x100", window1->bounds().ToString());
 }
 
 // Showing the resize shadows when the mouse is over the window edges is tested
 // in resize_shadow_and_cursor_test.cc
 
 }  // namespace test
 }  // namespace ash