Rename the aura_shell namespace to ash

ash/shell_unittest.cc

 // Copyright (c) 2011 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/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/aura_shell_test_base.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/size.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
-namespace aura_shell {
+namespace ash {
 
 namespace {
 
 views::Widget* CreateTestWindow(const views::Widget::InitParams& params) {
   views::Widget* widget = new views::Widget;
   widget->Init(params);
   return widget;
 }
 
 aura::Window* GetDefaultContainer() {
   return Shell::GetInstance()->GetContainer(
-        aura_shell::internal::kShellWindowId_DefaultContainer);
+        ash::internal::kShellWindowId_DefaultContainer);
 }
 
 aura::Window* GetAlwaysOnTopContainer() {
   return Shell::GetInstance()->GetContainer(
-        aura_shell::internal::kShellWindowId_AlwaysOnTopContainer);
+        ash::internal::kShellWindowId_AlwaysOnTopContainer);
 }
 
 void TestCreateWindow(views::Widget::InitParams::Type type,
                       bool always_on_top,
                       aura::Window* expected_container) {
   views::Widget::InitParams widget_params(type);
   widget_params.keep_on_top = always_on_top;
 
   views::Widget* widget = CreateTestWindow(widget_params);
   widget->Show();
@@ skipping 110 matching lines @@
   // It should be in default container.
   EXPECT_EQ(GetDefaultContainer(), widget->GetNativeWindow()->parent());
 
   // Create a modal window.
   views::Widget* modal_widget = views::Widget::CreateWindowWithParent(
       new ModalWindow(), widget->GetNativeView());
   modal_widget->Show();
 
   // It should be in modal container.
   aura::Window* modal_container = Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_ModalContainer);
+      ash::internal::kShellWindowId_ModalContainer);
   EXPECT_EQ(modal_container, modal_widget->GetNativeWindow()->parent());
 
   modal_widget->Close();
   widget->Close();
 }
 
 TEST_F(ShellTest, CreateLockScreenModalWindow) {
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW);
 
   // Create a normal window.
   views::Widget* widget = CreateTestWindow(widget_params);
   widget->Show();
 
   // It should be in default container.
   EXPECT_EQ(GetDefaultContainer(), widget->GetNativeWindow()->parent());
 
   // Create a LockScreen window.
   views::Widget* lock_widget = CreateTestWindow(widget_params);
-  aura_shell::Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_LockScreenContainer)->
+  ash::Shell::GetInstance()->GetContainer(
+      ash::internal::kShellWindowId_LockScreenContainer)->
       AddChild(lock_widget->GetNativeView());
   lock_widget->Show();
 
   // It should be in LockScreen container.
   aura::Window* lock_screen = Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_LockScreenContainer);
+      ash::internal::kShellWindowId_LockScreenContainer);
   EXPECT_EQ(lock_screen, lock_widget->GetNativeWindow()->parent());
 
   // Create a modal window with a lock window as parent.
   views::Widget* lock_modal_widget = views::Widget::CreateWindowWithParent(
       new ModalWindow(), lock_widget->GetNativeView());
   lock_modal_widget->Show();
 
   // It should be in LockScreen modal container.
   aura::Window* lock_modal_container = Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_LockModalContainer);
+      ash::internal::kShellWindowId_LockModalContainer);
   EXPECT_EQ(lock_modal_container,
             lock_modal_widget->GetNativeWindow()->parent());
 
   // Create a modal window with a normal window as parent.
   views::Widget* modal_widget = views::Widget::CreateWindowWithParent(
       new ModalWindow(), widget->GetNativeView());
   modal_widget->Show();
 
   // It should be in non-LockScreen modal container.
   aura::Window* modal_container = Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_ModalContainer);
+      ash::internal::kShellWindowId_ModalContainer);
   EXPECT_EQ(modal_container, modal_widget->GetNativeWindow()->parent());
 
   modal_widget->Close();
   lock_modal_widget->Close();
   lock_widget->Close();
   widget->Close();
 }
 
 TEST_F(ShellTest, IsScreenLocked) {
   views::Widget::InitParams widget_params(
@@ skipping 10 matching lines @@
   views::Widget* modal_widget = views::Widget::CreateWindowWithParent(
       new ModalWindow(), widget->GetNativeView());
   modal_widget->Show();
   EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked());
   modal_widget->Close();
   EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked());
   widget->Close();
 
   // A lock screen window locks the screen.
   views::Widget* lock_widget = CreateTestWindow(widget_params);
-  aura_shell::Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_LockScreenContainer)->
+  ash::Shell::GetInstance()->GetContainer(
+      ash::internal::kShellWindowId_LockScreenContainer)->
       AddChild(lock_widget->GetNativeView());
   lock_widget->Show();
   EXPECT_TRUE(Shell::GetInstance()->IsScreenLocked());
   lock_widget->Hide();
   EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked());
 
   // A modal window with a lock window as parent does not lock the screen. The
   // screen is locked only when a lock windown is visible.
   views::Widget* lock_modal_widget = views::Widget::CreateWindowWithParent(
       new ModalWindow(), lock_widget->GetNativeView());
@@ skipping 20 matching lines @@
   // Alex-sized screens need compact mode.
   monitor_size.SetSize(1280, 800);
   EXPECT_TRUE(shell->DefaultToCompactWindowMode(monitor_size, &command_line));
 
   // ZGB-sized screens need compact mode.
   monitor_size.SetSize(1366, 768);
   EXPECT_TRUE(shell->DefaultToCompactWindowMode(monitor_size, &command_line));
 
   // Even for a small screen, the user can force normal mode.
   monitor_size.SetSize(800, 600);
-  command_line.AppendSwitchASCII(aura_shell::switches::kAuraWindowMode,
-                                 aura_shell::switches::kAuraWindowModeNormal);
+  command_line.AppendSwitchASCII(ash::switches::kAuraWindowMode,
+                                 ash::switches::kAuraWindowModeNormal);
   EXPECT_FALSE(shell->DefaultToCompactWindowMode(monitor_size, &command_line));
 }
 
-}  // namespace aura_shell
+}  // namespace ash