Rename the aura_shell namespace to ash

ash/wm/root_window_event_filter_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/wm/root_window_event_filter.h"
 
 #include "ash/shell_window_ids.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/cursor.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/test/test_event_filter.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/screen.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 class RootWindowEventFilterTest : public aura::test::AuraTestBase {
  public:
   RootWindowEventFilterTest() {
     aura::RootWindow::GetInstance()->SetEventFilter(
         new internal::RootWindowEventFilter);
 
     aura::RootWindow::GetInstance()->set_id(
         internal::kShellWindowId_DefaultContainer);
@@ skipping 105 matching lines @@
   scoped_ptr<aura::Window> w2(aura::test::CreateTestWindowWithDelegate(
       &wd, 2, gfx::Rect(70, 70, 50, 50), NULL));
   d2.SetWindow(w2.get());
 
   aura::internal::FocusManager* focus_manager = w1->GetFocusManager();
 
   d1.Clear();
   d2.Clear();
 
   // Activate window1.
-  aura_shell::ActivateWindow(w1.get());
+  ash::ActivateWindow(w1.get());
   EXPECT_TRUE(IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), focus_manager->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
   d1.Clear();
 
   {
     // Click on window2.
     gfx::Point press_point = w2->bounds().CenterPoint();
     aura::Window::ConvertPointToWindow(w2->parent(), root_window, &press_point);
@@ skipping 54 matching lines @@
   scoped_ptr<aura::Window> w2(aura::test::CreateTestWindowWithDelegate(
       &wd, -2, gfx::Rect(70, 70, 50, 50), NULL));
   d2.SetWindow(w2.get());
 
   aura::internal::FocusManager* focus_manager = w1->GetFocusManager();
 
   d1.Clear();
   d2.Clear();
 
   // Activate window1.
-  aura_shell::ActivateWindow(w1.get());
+  ash::ActivateWindow(w1.get());
   EXPECT_TRUE(IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), focus_manager->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
   d1.Clear();
 
   // Touch window2.
   gfx::Point press_point = w2->bounds().CenterPoint();
   aura::Window::ConvertPointToWindow(w2->parent(), root_window, &press_point);
   aura::TouchEvent touchev1(ui::ET_TOUCH_PRESSED, press_point, 0);
@@ skipping 141 matching lines @@
   EXPECT_TRUE(IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), w1->GetFocusManager()->GetFocusedWindow());
 }
 
 TEST_F(RootWindowEventFilterTest, AdditionalFilters) {
   aura::RootWindow* root_window = aura::RootWindow::GetInstance();
 
   // Creates a window and make it active
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindow(
       SK_ColorWHITE, -1, gfx::Rect(0, 0, 100, 100), NULL));
-  aura_shell::ActivateWindow(w1.get());
+  ash::ActivateWindow(w1.get());
 
   // Creates two addition filters
   scoped_ptr<aura::test::TestEventFilter> f1(
       new aura::test::TestEventFilter(NULL));
   scoped_ptr<aura::test::TestEventFilter> f2(
       new aura::test::TestEventFilter(NULL));
 
   // Adds them to root window event filter.
   internal::RootWindowEventFilter* root_window_filter =
       static_cast<internal::RootWindowEventFilter*>(
@@ skipping 44 matching lines @@
   // f1 should get no events since it's out and f2 should get them.
   EXPECT_EQ(0, f1->key_event_count());
   EXPECT_EQ(0, f1->mouse_event_count());
   EXPECT_EQ(1, f2->key_event_count());
   EXPECT_EQ(1, f2->mouse_event_count());
 
   root_window_filter->RemoveFilter(f2.get());
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash