Eliminate ash::internal namespace

ash/wm/lock_state_controller_unittest.cc

 // Copyright 2013 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/lock_state_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 18 matching lines @@
 #include "ui/display/chromeos/output_configurator.h"
 #include "ui/display/chromeos/test/test_display_snapshot.h"
 #include "ui/display/display_constants.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace ash {
-
-using internal::SessionStateAnimator;
-
 namespace test {
-
 namespace {
 
 bool cursor_visible() {
   return ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible();
 }
 
 void CheckCalledCallback(bool* flag) {
   if (flag)
     (*flag) = true;
 }
 
 aura::Window* GetContainer(int container ) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   return Shell::GetContainer(root_window, container);
 }
 
 bool IsBackgroundHidden() {
-  return !GetContainer(internal::kShellWindowId_DesktopBackgroundContainer)->
-              IsVisible();
+  return !GetContainer(kShellWindowId_DesktopBackgroundContainer)->IsVisible();
 }
 
 void HideBackground() {
   ui::ScopedLayerAnimationSettings settings(
-      GetContainer(internal::kShellWindowId_DesktopBackgroundContainer)->
-          layer()->GetAnimator());
+      GetContainer(kShellWindowId_DesktopBackgroundContainer)
+          ->layer()
+          ->GetAnimator());
   settings.SetTransitionDuration(base::TimeDelta());
-  GetContainer(internal::kShellWindowId_DesktopBackgroundContainer)->Hide();
+  GetContainer(kShellWindowId_DesktopBackgroundContainer)->Hide();
 }
 
 } // namespace
 
 // Fake implementation of PowerButtonControllerDelegate that just logs requests
 // to lock the screen and shut down the device.
 class TestLockStateControllerDelegate : public LockStateControllerDelegate {
  public:
   TestLockStateControllerDelegate()
       : num_lock_requests_(0),
@@ skipping 308 matching lines @@
       SetCanLockScreen(false);
     lock_state_controller_->OnLockStateChanged(false);
   }
 
   void CreateWindowForLockscreen() {
     window_.reset(new aura::Window(&window_delegate_));
     window_->SetBounds(gfx::Rect(0, 0, 100, 100));
     window_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     window_->Init(aura::WINDOW_LAYER_TEXTURED);
     window_->SetName("WINDOW");
-    aura::Window* container = Shell::GetContainer(Shell::GetPrimaryRootWindow(),
-        internal::kShellWindowId_LockScreenContainer);
+    aura::Window* container = Shell::GetContainer(
+        Shell::GetPrimaryRootWindow(), kShellWindowId_LockScreenContainer);
     ASSERT_TRUE(container);
     container->AddChild(window_.get());
     window_->Show();
   }
 
   PowerButtonController* controller_;  // not owned
   LockStateController* lock_state_controller_;  // not owned
   TestLockStateControllerDelegate* delegate_;  // not owned
   TestShellDelegate* shell_delegate_;  // not owned
   SessionStateDelegate* session_state_delegate_;  // not owned
@@ skipping 199 matching lines @@
   // start lifting the non-screen-locker containers.
   PressPowerButton();
 
   ExpectPreLockAnimationStarted();
   EXPECT_TRUE(test_api_->is_lock_cancellable());
 
   // forward only half way through
   AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.5f);
 
   gfx::Transform transform_before_button_released =
-      GetContainer(internal::kShellWindowId_DefaultContainer)->
-          layer()->transform();
+      GetContainer(kShellWindowId_DefaultContainer)->layer()->transform();
 
   // Release the button before the lock timer fires.
   ReleasePowerButton();
 
   ExpectPreLockAnimationCancel();
 
   gfx::Transform transform_after_button_released =
-      GetContainer(internal::kShellWindowId_DefaultContainer)->
-          layer()->transform();
+      GetContainer(kShellWindowId_DefaultContainer)->layer()->transform();
   // Expect no flickering, animation should proceed from mid-state.
   EXPECT_EQ(transform_before_button_released, transform_after_button_released);
 
   Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS);
   ExpectUnlockedState();
   EXPECT_EQ(0, delegate_->num_lock_requests());
 }
 
 // Test that we deal with cancelling lock correctly.
 // TODO(antrim): Reenable this: http://crbug.com/167048
@@ skipping 475 matching lines @@
 
   Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS);
   ExpectUnlockAfterUIDestroyedAnimationFinished();
   EXPECT_TRUE(IsBackgroundHidden());
 
   ExpectUnlockedState();
 }
 
 }  // namespace test
 }  // namespace ash