3 files changed, 8 insertions, 8 deletions
diff --git a/apps/apps.gypi b/apps/apps.gypi
index c6dc3ab..0d788c9 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -112,8 +112,8 @@
             '../content/content.gyp:content',
             '../content/content_shell_and_tests.gyp:content_shell_lib',
             '../skia/skia.gyp:skia',
-            '../ui/shell/shell.gyp:shell',
             '../ui/views/views.gyp:views',
+            '../ui/wm/wm.gyp:wm_test_support',
           ],
           'include_dirs': [
             '..',
diff --git a/apps/shell/app_shell_browser_main_parts.cc b/apps/shell/app_shell_browser_main_parts.cc
index 8a369df..5c9000d 100644
--- a/apps/shell/app_shell_browser_main_parts.cc
+++ b/apps/shell/app_shell_browser_main_parts.cc
@@ -11,7 +11,7 @@
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_screen.h"
-#include "ui/shell/minimal_shell.h"
+#include "ui/wm/test/minimal_shell.h"
 
 namespace apps {
 
@@ -42,7 +42,7 @@ void AppShellBrowserMainParts::PreMainMessageLoopRun() {
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());
   // Set up basic pieces of views::corewm.
-  minimal_shell_.reset(new shell::MinimalShell(gfx::Size(800, 600)));
+  minimal_shell_.reset(new wm::MinimalShell(gfx::Size(800, 600)));
   // Ensure the X window gets mapped.
   minimal_shell_->root_window()->host()->Show();
 
diff --git a/apps/shell/app_shell_browser_main_parts.h b/apps/shell/app_shell_browser_main_parts.h
index bcbfa8f..b32c715 100644
--- a/apps/shell/app_shell_browser_main_parts.h
+++ b/apps/shell/app_shell_browser_main_parts.h
@@ -15,14 +15,14 @@ class ShellBrowserContext;
 struct MainFunctionParams;
 }
 
-namespace shell {
-class MinimalShell;
-}
-
 namespace views {
 class ViewsDelegate;
 }
 
+namespace wm {
+class MinimalShell;
+}
+
 namespace apps {
 
 // Handles initialization of AppShell.
@@ -48,7 +48,7 @@ class AppShellBrowserMainParts : public content::BrowserMainParts {
   scoped_ptr<content::ShellBrowserContext> browser_context_;
 
   // Enable a minimal set of views::corewm to be initialized.
-  scoped_ptr<shell::MinimalShell> minimal_shell_;
+  scoped_ptr<wm::MinimalShell> minimal_shell_;
 
   DISALLOW_COPY_AND_ASSIGN(AppShellBrowserMainParts);
 };