Shell related switches -> aura shell switches.

ui/aura_shell/activation_controller_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 "ui/aura_shell/activation_controller.h"
 
-#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura_shell/test/aura_shell_test_base.h"
 #include "ui/aura_shell/test/test_activation_delegate.h"
 #include "ui/aura_shell/window_util.h"
 
 #if defined(OS_WIN)
@@ skipping 114 matching lines @@
   ad1.SetWindow(w1.get());
   EXPECT_TRUE(IsActiveWindow(NULL));
 
   // Clicking on an activatable window activtes the window.
   aura::test::EventGenerator generator(w1.get());
   generator.ClickLeftButton();
   EXPECT_TRUE(IsActiveWindow(w1.get()));
 
   // Creates a menu that covers the transient parent.
   scoped_ptr<aura::Window> menu(aura::test::CreateTestWindowWithDelegateAndType(
-      &wd, aura::WINDOW_TYPE_MENU, 2, gfx::Rect(100, 100), NULL));
+      &wd, aura::client::WINDOW_TYPE_MENU, 2, gfx::Rect(100, 100), NULL));
   ad2.SetWindow(menu.get());
   w1->AddTransientChild(menu.get());
 
   // Clicking on a menu whose transient parent is active window shouldn't
   // change the active window.
   generator.ClickLeftButton();
   EXPECT_TRUE(IsActiveWindow(w1.get()));
 }
 
 // Various assertions for activating/deactivating.
@@ skipping 119 matching lines @@
 
   // Try focusing |w21|. Same rules apply.
   EXPECT_FALSE(IsActiveWindow(w2.get()));
   EXPECT_FALSE(w21->HasFocus());
   EXPECT_TRUE(IsActiveWindow(w1.get()));
   EXPECT_TRUE(w1->HasFocus());
 }
 
 }  // namespace test
 }  // namespace aura_shell