Move some more WM functionality down into ash.

ash/wm/workspace/workspace_manager_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/workspace_manager.h"
+#include "ash/wm/workspace/workspace_manager.h"
 
 #include "ash/wm/activation_controller.h"
+#include "ash/wm/workspace/workspace.h"
+#include "ash/wm/workspace/workspace_observer.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/shell_window_ids.h"
-#include "ui/aura_shell/workspace/workspace.h"
-#include "ui/aura_shell/workspace/workspace_observer.h"
 #include "ui/base/ui_base_types.h"
 
 namespace {
 using aura_shell::internal::Workspace;
 using aura_shell::internal::WorkspaceManager;
 using aura::Window;
 
 class TestWorkspaceObserver : public aura_shell::internal::WorkspaceObserver {
  public:
   explicit TestWorkspaceObserver(WorkspaceManager* manager)
@@ skipping 532 matching lines @@
 
   w2->SetIntProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   EXPECT_TRUE(ws->ContainsFullscreenWindow());
 
   w2->Hide();
   EXPECT_FALSE(ws->ContainsFullscreenWindow());
 }
 
 }  // namespace internal
 }  // namespace aura_shell