Move some more WM functionality down into ash.

ash/wm/workspace_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/workspace_controller.h"
+#include "ash/wm/workspace_controller.h"
 
 #include "ash/wm/activation_controller.h"
+#include "ash/wm/window_util.h"
+#include "ash/wm/workspace/workspace.h"
+#include "ash/wm/workspace/workspace_manager.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/shell_window_ids.h"
-#include "ui/aura_shell/window_util.h"
-#include "ui/aura_shell/workspace/workspace.h"
-#include "ui/aura_shell/workspace/workspace_manager.h"
 
 namespace aura_shell {
 namespace internal {
 
 using aura::Window;
 
 class WorkspaceControllerTest : public aura::test::AuraTestBase {
  public:
   WorkspaceControllerTest() {}
   virtual ~WorkspaceControllerTest() {}
@@ skipping 85 matching lines @@
   // The size of contents_view() for no workspace case must be
   // same as one contents_view() case.
   EXPECT_EQ("0,0 500x300", contents_view()->bounds().ToString());
 
   // Reset now before windows are destroyed.
   controller_.reset();
 }
 
 }  // namespace internal
 }  // namespace aura_shell