Eliminate ash::internal namespace

ash/system/web_notification/web_notification_tray_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/system/web_notification/web_notification_tray.h"
 
 #include <vector>
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
@@ skipping 28 matching lines @@
 namespace ash {
 
 namespace {
 
 WebNotificationTray* GetTray() {
   return Shell::GetPrimaryRootWindowController()->shelf()->
       status_area_widget()->web_notification_tray();
 }
 
 WebNotificationTray* GetSecondaryTray() {
-  internal::RootWindowController* primary_controller =
+  RootWindowController* primary_controller =
       Shell::GetPrimaryRootWindowController();
   Shell::RootWindowControllerList controllers =
       Shell::GetAllRootWindowControllers();
   for (size_t i = 0; i < controllers.size(); ++i) {
     if (controllers[i] != primary_controller) {
       return controllers[i]->shelf()->
           status_area_widget()->web_notification_tray();
     }
   }
 
@@ skipping 226 matching lines @@
   // UpdateDisplay() creates the display notifications, so popup is visible.
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   WebNotificationTray* secondary_tray = GetSecondaryTray();
   ASSERT_TRUE(secondary_tray);
   EXPECT_TRUE(secondary_tray->IsPopupVisible());
 
   // Transition to mirroring and then back to extended display, which recreates
   // root window controller and shelf with having notifications. This code
   // verifies it doesn't cause crash and popups are still visible. See
   // http://crbug.com/263664
-  internal::DisplayManager* display_manager =
-      Shell::GetInstance()->display_manager();
+  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
-  display_manager->SetSecondDisplayMode(internal::DisplayManager::MIRRORING);
+  display_manager->SetSecondDisplayMode(DisplayManager::MIRRORING);
   UpdateDisplay("400x400,200x200");
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   EXPECT_FALSE(GetSecondaryTray());
 
-  display_manager->SetSecondDisplayMode(internal::DisplayManager::EXTENDED);
+  display_manager->SetSecondDisplayMode(DisplayManager::EXTENDED);
   UpdateDisplay("400x400,200x200");
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   secondary_tray = GetSecondaryTray();
   ASSERT_TRUE(secondary_tray);
   EXPECT_TRUE(secondary_tray->IsPopupVisible());
 }
 
 #if defined(OS_CHROMEOS)
 // PopupAndSystemTray may fail in platforms other than ChromeOS because the
 // RootWindow's bound can be bigger than gfx::Display's work area so that
@@ skipping 48 matching lines @@
 }
 
 TEST_F(WebNotificationTrayTest, MAYBE_PopupAndAutoHideShelf) {
   AddNotification("test_id");
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   gfx::Rect work_area = GetPopupWorkArea();
 
   // Shelf's auto-hide state won't be HIDDEN unless window exists.
   scoped_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 3, 4)));
-  internal::ShelfLayoutManager* shelf =
+  ShelfLayoutManager* shelf =
       Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
 
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
   gfx::Rect work_area_auto_hidden = GetPopupWorkArea();
   EXPECT_LT(work_area.size().GetArea(), work_area_auto_hidden.size().GetArea());
 
   // Close the window, which shows the shelf.
   window.reset();
   EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state());
@@ skipping 41 matching lines @@
 }
 
 TEST_F(WebNotificationTrayTest, MAYBE_PopupAndFullscreen) {
   AddNotification("test_id");
   EXPECT_TRUE(IsPopupVisible());
   gfx::Rect work_area = GetPopupWorkArea();
 
   // Checks the work area for normal auto-hidden state.
   scoped_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 3, 4)));
-  internal::ShelfLayoutManager* shelf =
+  ShelfLayoutManager* shelf =
       Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
   gfx::Rect work_area_auto_hidden = GetPopupWorkArea();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
 
   // Put |window| into fullscreen without forcing the shelf to hide. Currently,
   // this is used by immersive fullscreen and forces the shelf to be auto
   // hidden.
   wm::GetWindowState(window.get())->set_hide_shelf_when_fullscreen(false);
@@ skipping 32 matching lines @@
 
   // System tray is created on the primary display. The popups in the secondary
   // tray aren't affected.
   GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
   EXPECT_GT(work_area.size().GetArea(), GetPopupWorkArea().size().GetArea());
   EXPECT_EQ(work_area_second.ToString(),
             GetPopupWorkAreaForTray(GetSecondaryTray()).ToString());
 }
 
 }  // namespace ash