Eliminate ash::internal namespace

ash/wm/lock_state_controller_unittest.cc

Index: ash/wm/lock_state_controller_unittest.cc
diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc
index b950fe1c2fac8d2a355b3c77ddafd3ea2bac0145..8b683b3d078458c26f5e8333ffba666a0372ebf1 100644
--- a/ash/wm/lock_state_controller_unittest.cc
+++ b/ash/wm/lock_state_controller_unittest.cc
@@ -36,11 +36,7 @@
 #endif
 
 namespace ash {
-
-using internal::SessionStateAnimator;
-
 namespace test {
-
 namespace {
 
 bool cursor_visible() {
@@ -58,16 +54,16 @@ aura::Window* GetContainer(int 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
@@ -396,8 +392,8 @@ class LockStateControllerTest : public AshTestBase {
     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();
@@ -617,8 +613,7 @@ TEST_F(LockStateControllerTest, DISABLED_LockAndCancel) {
   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();
@@ -626,8 +621,7 @@ TEST_F(LockStateControllerTest, DISABLED_LockAndCancel) {
   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);