Eliminate ash::internal namespace

ash/focus_cycler_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/focus_cycler.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.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/views/accessible_pane_view.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace test {
 
 using aura::Window;
-using internal::FocusCycler;
 
 namespace {
 
-internal::StatusAreaWidgetDelegate* GetStatusAreaWidgetDelegate(
-    views::Widget* widget) {
-  return static_cast<internal::StatusAreaWidgetDelegate*>(
-      widget->GetContentsView());
+StatusAreaWidgetDelegate* GetStatusAreaWidgetDelegate(views::Widget* widget) {
+  return static_cast<StatusAreaWidgetDelegate*>(widget->GetContentsView());
 }
 
 class PanedWidgetDelegate : public views::WidgetDelegate {
  public:
   PanedWidgetDelegate(views::Widget* widget) : widget_(widget) {}
 
   void SetAccessiblePanes(const std::vector<views::View*>& panes) {
     accessible_panes_ = panes;
   }
 
@@ skipping 41 matching lines @@
     focus_cycler_.reset();
 
     AshTestBase::TearDown();
   }
 
  protected:
   // Creates the system tray, returning true on success.
   bool CreateTray() {
     if (tray_)
       return false;
-    aura::Window* parent = Shell::GetPrimaryRootWindowController()->
-        GetContainer(ash::internal::kShellWindowId_StatusContainer);
+    aura::Window* parent =
+        Shell::GetPrimaryRootWindowController()->GetContainer(
+            ash::kShellWindowId_StatusContainer);
 
-    internal::StatusAreaWidget* widget = new internal::StatusAreaWidget(parent);
+    StatusAreaWidget* widget = new StatusAreaWidget(parent);
     widget->CreateTrayViews();
     widget->Show();
     tray_.reset(widget->system_tray());
     if (!tray_->GetWidget())
       return false;
     focus_cycler_->AddWidget(tray()->GetWidget());
     GetStatusAreaWidgetDelegate(tray_->GetWidget())->SetFocusCyclerForTesting(
         focus_cycler());
     return true;
   }
@@ skipping 287 matching lines @@
   // should do the same thing.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(shelf_widget()->IsActive());
   event_generator.PressKey(ui::VKEY_ESCAPE, 0);
   EXPECT_TRUE(wm::IsActiveWindow(browser_window));
   EXPECT_EQ(focus_manager->GetFocusedView(), view1);
 }
 
 }  // namespace test
 }  // namespace ash