Eliminate ash::internal namespace

ash/desktop_background/desktop_background_controller_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/desktop_background/desktop_background_controller.h"
 
 #include <cmath>
 #include <cstdlib>
 
 #include "ash/ash_switches.h"
@@ skipping 23 matching lines @@
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
 using aura::RootWindow;
 using aura::Window;
 
 namespace ash {
 namespace {
 
 // Containers IDs used for tests.
-const int kDesktopBackgroundId =
-    ash::internal::kShellWindowId_DesktopBackgroundContainer;
+const int kDesktopBackgroundId = ash::kShellWindowId_DesktopBackgroundContainer;
 const int kLockScreenBackgroundId =
-    ash::internal::kShellWindowId_LockScreenBackgroundContainer;
+    ash::kShellWindowId_LockScreenBackgroundContainer;
 
 // Returns number of child windows in a shell window container.
 int ChildCountForContainer(int container_id) {
   Window* root = ash::Shell::GetPrimaryRootWindow();
   Window* container = root->GetChildById(container_id);
   return static_cast<int>(container->children().size());
 }
 
 class TestObserver : public DesktopBackgroundControllerObserver {
  public:
@@ skipping 46 matching lines @@
   DesktopBackgroundControllerTest()
       : command_line_(CommandLine::NO_PROGRAM),
         controller_(NULL) {
   }
   virtual ~DesktopBackgroundControllerTest() {}
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
     // Ash shell initialization creates wallpaper. Reset it so we can manually
     // control wallpaper creation and animation in our tests.
-    internal::RootWindowController* root_window_controller =
+    RootWindowController* root_window_controller =
         Shell::GetPrimaryRootWindowController();
     root_window_controller->SetWallpaperController(NULL);
     root_window_controller->SetAnimatingWallpaperController(NULL);
     controller_ = Shell::GetInstance()->desktop_background_controller();
     wallpaper_delegate_ = static_cast<test::TestUserWallpaperDelegate*>(
         Shell::GetInstance()->user_wallpaper_delegate());
     controller_->set_wallpaper_reload_delay_for_test(0);
   }
 
  protected:
@@ skipping 19 matching lines @@
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
     bitmap.allocPixels();
     bitmap.eraseColor(color);
     gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
     return image;
   }
 
   // Runs kAnimatingDesktopController's animation to completion.
   // TODO(bshe): Don't require tests to run animations; it's slow.
   void RunDesktopControllerAnimation() {
-    internal::DesktopBackgroundWidgetController* controller =
-        Shell::GetPrimaryRootWindowController()->
-        animating_wallpaper_controller()->GetController(false);
+    DesktopBackgroundWidgetController* controller =
+        Shell::GetPrimaryRootWindowController()
+            ->animating_wallpaper_controller()
+            ->GetController(false);
     ASSERT_NO_FATAL_FAILURE(RunAnimationForWidget(controller->widget()));
   }
 
   // Returns true if the color at the center of |image| is close to
   // |expected_color|. (The center is used so small wallpaper images can be
   // used.)
   bool ImageIsNearColor(gfx::ImageSkia image, SkColor expected_color) {
     if (image.size().IsEmpty()) {
       LOG(ERROR) << "Image is empty";
       return false;
@@ skipping 147 matching lines @@
   ui::ScopedAnimationDurationScaleMode normal_duration_mode(
       ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
 
   // Create wallpaper and background view.
   DesktopBackgroundController* controller =
       Shell::GetInstance()->desktop_background_controller();
   controller->CreateEmptyWallpaper();
 
   // The new wallpaper is ready to start animating. kAnimatingDesktopController
   // holds the widget controller instance. kDesktopController will get it later.
-  internal::RootWindowController* root_window_controller =
+  RootWindowController* root_window_controller =
       Shell::GetPrimaryRootWindowController();
   EXPECT_TRUE(root_window_controller->animating_wallpaper_controller()->
               GetController(false));
 
   // kDesktopController will receive the widget controller when the animation
   // is done.
   EXPECT_FALSE(root_window_controller->wallpaper_controller());
 
   // Force the widget's layer animation to play to completion.
   RunDesktopControllerAnimation();
@@ skipping 21 matching lines @@
 
   // User locks the screen, which moves the background forward.
   controller->MoveDesktopToLockedContainer();
 
   // Suspend/resume cycle causes wallpaper to refresh, loading a new desktop
   // background that will animate in on top of the old one.
   controller->CreateEmptyWallpaper();
 
   // In this state we have two desktop background views stored in different
   // properties. Both are in the lock screen background container.
-  internal::RootWindowController* root_window_controller =
+  RootWindowController* root_window_controller =
       Shell::GetPrimaryRootWindowController();
   EXPECT_TRUE(root_window_controller->animating_wallpaper_controller()->
               GetController(false));
   EXPECT_TRUE(root_window_controller->wallpaper_controller());
   EXPECT_EQ(0, ChildCountForContainer(kDesktopBackgroundId));
   EXPECT_EQ(2, ChildCountForContainer(kLockScreenBackgroundId));
 
   // Before the wallpaper's animation completes, user unlocks the screen, which
   // moves the desktop to the back.
   controller->MoveDesktopToUnlockedContainer();
@@ skipping 21 matching lines @@
   DesktopBackgroundController* controller =
       Shell::GetInstance()->desktop_background_controller();
   controller->CreateEmptyWallpaper();
 
   // Run wallpaper show animation to completion.
   RunDesktopControllerAnimation();
 
   // Change to a new wallpaper.
   controller->CreateEmptyWallpaper();
 
-  internal::RootWindowController* root_window_controller =
+  RootWindowController* root_window_controller =
       Shell::GetPrimaryRootWindowController();
-  internal::DesktopBackgroundWidgetController* animating_controller =
-      root_window_controller->animating_wallpaper_controller()->
-      GetController(false);
+  DesktopBackgroundWidgetController* animating_controller =
+      root_window_controller->animating_wallpaper_controller()->GetController(
+          false);
   EXPECT_TRUE(animating_controller);
   EXPECT_TRUE(root_window_controller->wallpaper_controller());
 
   // Change to another wallpaper before animation finished.
   controller->CreateEmptyWallpaper();
 
   // The animating controller should immediately move to desktop controller.
   EXPECT_EQ(animating_controller,
             root_window_controller->wallpaper_controller());
 
@@ skipping 264 matching lines @@
   // new load task was started (since the previous one was interrupted by
   // SetCustomWallpaper()). See http://crbug.com/327443.
   TestObserver observer(controller_);
   ASSERT_TRUE(controller_->SetDefaultWallpaper(false));
   observer.WaitForWallpaperDataChanged();
   EXPECT_TRUE(ImageIsNearColor(controller_->GetWallpaper(),
                                kSmallWallpaperColor));
 }
 
 }  // namespace ash