Eliminate ash::internal namespace

ash/wm/panels/panel_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/panels/panel_layout_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
@@ skipping 20 matching lines @@
 #include "base/run_loop.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
-namespace internal {
 
 using aura::test::WindowIsAbove;
 
 class PanelLayoutManagerTest : public test::AshTestBase {
  public:
   PanelLayoutManagerTest() {}
   virtual ~PanelLayoutManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
@@ skipping 16 matching lines @@
     shelf_delegate->AddShelfItem(window);
     PanelLayoutManager* manager = static_cast<PanelLayoutManager*>(
         GetPanelContainer(window)->layout_manager());
     manager->Relayout();
     shelf_view_test()->RunMessageLoopUntilAnimationsDone();
     return window;
   }
 
   aura::Window* GetPanelContainer(aura::Window* panel) {
     return Shell::GetContainer(panel->GetRootWindow(),
-                               internal::kShellWindowId_PanelContainer);
+                               kShellWindowId_PanelContainer);
   }
 
   views::Widget* GetCalloutWidgetForPanel(aura::Window* panel) {
     PanelLayoutManager* manager =
         static_cast<PanelLayoutManager*>(GetPanelContainer(panel)->
                                          layout_manager());
     DCHECK(manager);
     PanelLayoutManager::PanelList::iterator found = std::find(
         manager->panel_windows_.begin(), manager->panel_windows_.end(),
         panel);
@@ skipping 142 matching lines @@
     shell->SetShelfAlignment(alignment, root_window);
   }
 
   ShelfAlignment GetAlignment(aura::Window* root_window) {
     ash::Shell* shell = ash::Shell::GetInstance();
     return shell->GetShelfAlignment(root_window);
   }
 
   void SetShelfAutoHideBehavior(aura::Window* window,
                                 ShelfAutoHideBehavior behavior) {
-    internal::ShelfLayoutManager* shelf =
-        RootWindowController::ForWindow(window)->shelf()->
-        shelf_layout_manager();
+    ShelfLayoutManager* shelf = RootWindowController::ForWindow(window)
+                                    ->shelf()
+                                    ->shelf_layout_manager();
     shelf->SetAutoHideBehavior(behavior);
     ShelfView* shelf_view = GetShelfView(Shelf::ForWindow(window));
     test::ShelfViewTestAPI test_api(shelf_view);
     test_api.RunMessageLoopUntilAnimationsDone();
   }
 
   void SetShelfVisibilityState(aura::Window* window,
                                ShelfVisibilityState visibility_state) {
-    internal::ShelfLayoutManager* shelf =
-        RootWindowController::ForWindow(window)->shelf()->
-        shelf_layout_manager();
+    ShelfLayoutManager* shelf = RootWindowController::ForWindow(window)
+                                    ->shelf()
+                                    ->shelf_layout_manager();
     shelf->SetState(visibility_state);
   }
 
-  internal::ShelfView* GetShelfView(Shelf* shelf) {
+  ShelfView* GetShelfView(Shelf* shelf) {
     return test::ShelfTestAPI(shelf).shelf_view();
   }
 
  private:
   scoped_ptr<test::ShelfViewTestAPI> shelf_view_test_;
 
   bool IsHorizontal(ShelfAlignment alignment) {
     return alignment == SHELF_ALIGNMENT_BOTTOM ||
            alignment == SHELF_ALIGNMENT_TOP;
   }
@@ skipping 333 matching lines @@
 
   ShelfView* shelf_view_1st = GetShelfView(Shelf::ForPrimaryDisplay());
   ShelfView* shelf_view_2nd =
       GetShelfView(Shelf::ForWindow(root_windows[1]));
 
   EXPECT_EQ(root_windows[0], p1_d1->GetRootWindow());
   EXPECT_EQ(root_windows[0], p2_d1->GetRootWindow());
   EXPECT_EQ(root_windows[1], p1_d2->GetRootWindow());
   EXPECT_EQ(root_windows[1], p2_d2->GetRootWindow());
 
-  EXPECT_EQ(internal::kShellWindowId_PanelContainer, p1_d1->parent()->id());
-  EXPECT_EQ(internal::kShellWindowId_PanelContainer, p2_d1->parent()->id());
-  EXPECT_EQ(internal::kShellWindowId_PanelContainer, p1_d2->parent()->id());
-  EXPECT_EQ(internal::kShellWindowId_PanelContainer, p2_d2->parent()->id());
+  EXPECT_EQ(kShellWindowId_PanelContainer, p1_d1->parent()->id());
+  EXPECT_EQ(kShellWindowId_PanelContainer, p2_d1->parent()->id());
+  EXPECT_EQ(kShellWindowId_PanelContainer, p1_d2->parent()->id());
+  EXPECT_EQ(kShellWindowId_PanelContainer, p2_d2->parent()->id());
 
   // Test a panel on 1st display.
   // Clicking on the same display has no effect.
   ClickShelfItemForWindow(shelf_view_1st, p1_d1.get());
   EXPECT_EQ(root_windows[0], p1_d1->GetRootWindow());
   EXPECT_EQ(root_windows[0], p2_d1->GetRootWindow());
   EXPECT_EQ(root_windows[1], p1_d2->GetRootWindow());
   EXPECT_EQ(root_windows[1], p1_d2->GetRootWindow());
   EXPECT_FALSE(root_windows[1]->GetBoundsInScreen().Contains(
       p1_d1->GetBoundsInScreen()));
@@ skipping 155 matching lines @@
 
   // Windows should be restored to their prior state.
   EXPECT_TRUE(w1->IsVisible());
   EXPECT_FALSE(w2->IsVisible());
   EXPECT_TRUE(w3->IsVisible());
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelLayoutManagerTextDirectionTest,
                         testing::Bool());
 
-}  // namespace internal
 }  // namespace ash