Shell related switches -> aura shell switches.

ui/aura/test/test_windows.h

Index: ui/aura/test/test_windows.h
===================================================================
--- ui/aura/test/test_windows.h	(revision 114849)
+++ ui/aura/test/test_windows.h	(working copy)
@@ -8,9 +8,9 @@
 
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/aura/client/window_types.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/aura_test_base.h"
-#include "ui/aura/window_types.h"
 
 namespace aura {
 namespace test {
@@ -26,7 +26,7 @@
                                      const gfx::Rect& bounds,
                                      Window* parent);
 Window* CreateTestWindowWithDelegateAndType(WindowDelegate* delegate,
-                                            WindowType type,
+                                            client::WindowType type,
                                             int id,
                                             const gfx::Rect& bounds,
                                             Window* parent);