Rename the aura_shell namespace to ash

http://crbug.com/108457
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/9033007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115748 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 19 insertions, 19 deletions

diff --git a/ash/test/ash_unittests.cc b/ash/test/ash_unittests.cc
index ad39e19..7602d9a 100644
--- a/ash/test/ash_unittests.cc
+++ b/ash/test/ash_unittests.cc
@@ -5,5 +5,5 @@
 #include "ash/test/test_suite.h"
 
 int main(int argc, char** argv) {
-  return aura_shell::test::AuraShellTestSuite(argc, argv).Run();
+  return ash::test::AuraShellTestSuite(argc, argv).Run();
 }
diff --git a/ash/test/aura_shell_test_base.cc b/ash/test/aura_shell_test_base.cc
index 6b99331..b6011de 100644
--- a/ash/test/aura_shell_test_base.cc
+++ b/ash/test/aura_shell_test_base.cc
@@ -7,7 +7,7 @@
 #include "ash/shell.h"
 #include "ash/test/test_shell_delegate.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 AuraShellTestBase::AuraShellTestBase() {
@@ -20,7 +20,7 @@ void AuraShellTestBase::SetUp() {
   aura::test::AuraTestBase::SetUp();
 
   // Creates Shell and hook with Desktop.
-  aura_shell::Shell::CreateInstance(new TestShellDelegate);
+  ash::Shell::CreateInstance(new TestShellDelegate);
 }
 
 void AuraShellTestBase::TearDown() {
@@ -28,10 +28,10 @@ void AuraShellTestBase::TearDown() {
   RunAllPendingInMessageLoop();
 
   // Tear down the shell.
-  aura_shell::Shell::DeleteInstance();
+  ash::Shell::DeleteInstance();
 
   aura::test::AuraTestBase::TearDown();
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/test/aura_shell_test_base.h b/ash/test/aura_shell_test_base.h
index 92cb9ca..4084875 100644
--- a/ash/test/aura_shell_test_base.h
+++ b/ash/test/aura_shell_test_base.h
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "ui/aura/test/aura_test_base.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 class AuraShellTestBase : public aura::test::AuraTestBase {
@@ -26,6 +26,6 @@ class AuraShellTestBase : public aura::test::AuraTestBase {
 };
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_TEST_AURA_SHELL_TEST_BASE_H_
diff --git a/ash/test/test_activation_delegate.cc b/ash/test/test_activation_delegate.cc
index e92223a..44e6be5 100644
--- a/ash/test/test_activation_delegate.cc
+++ b/ash/test/test_activation_delegate.cc
@@ -8,7 +8,7 @@
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -50,4 +50,4 @@ void TestActivationDelegate::OnLostActive() {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/test/test_activation_delegate.h b/ash/test/test_activation_delegate.h
index d799745..3c543a7 100644
--- a/ash/test/test_activation_delegate.h
+++ b/ash/test/test_activation_delegate.h
@@ -14,7 +14,7 @@ namespace aura {
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 // A test ActivationDelegate that can be used to track activation changes for
@@ -54,6 +54,6 @@ class TestActivationDelegate : public aura::client::ActivationDelegate {
 };
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_TEST_TEST_ACTIVATION_DELEGATE_H_
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index eb289f4..3da311a 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -4,7 +4,7 @@
 
 #include "ash/test/test_shell_delegate.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 TestShellDelegate::TestShellDelegate() {
@@ -40,4 +40,4 @@ bool TestShellDelegate::ConfigureLauncherItem(LauncherItem* item) {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 1acc6a0..7b20e98 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -9,7 +9,7 @@
 #include "ash/shell_delegate.h"
 #include "base/compiler_specific.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 class TestShellDelegate : public ShellDelegate {
@@ -30,6 +30,6 @@ class TestShellDelegate : public ShellDelegate {
 };
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_TEST_TEST_SHELL_DELEGATE_H_
diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc
index eb22a6b..f3ebe9b 100644
--- a/ash/test/test_suite.cc
+++ b/ash/test/test_suite.cc
@@ -18,7 +18,7 @@
 #include "ui/gfx/test/gfx_test_utils.h"
 #endif
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv)
@@ -49,4 +49,4 @@ void AuraShellTestSuite::Shutdown() {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/test/test_suite.h b/ash/test/test_suite.h
index 5a32b69..bc7c5a0 100644
--- a/ash/test/test_suite.h
+++ b/ash/test/test_suite.h
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/test/test_suite.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 class AuraShellTestSuite : public base::TestSuite {
@@ -23,6 +23,6 @@ class AuraShellTestSuite : public base::TestSuite {
 };
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_TEST_TEST_SUITE_H_