Move some more WM functionality down into ash.

ash/wm/default_container_layout_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/default_container_layout_manager.h"
+#include "ash/wm/default_container_layout_manager.h"
 
+#include "ash/wm/workspace/workspace.h"
+#include "ash/wm/workspace/workspace_manager.h"
+#include "ash/wm/workspace_controller.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.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/workspace/workspace.h"
-#include "ui/aura_shell/workspace/workspace_manager.h"
-#include "ui/aura_shell/workspace_controller.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 namespace aura_shell {
 namespace test {
 
 namespace {
 
 using views::Widget;
 using aura_shell::internal::DefaultContainerLayoutManager;
@@ skipping 304 matching lines @@
 
   Restore(w1.get());
   // The following test does not pass due to crbug.com/102413.
   // TODO(oshima): Re-enable this once the bug is fixed.
   // EXPECT_EQ(window_bounds.size().ToString(),
   //           w1->GetTargetBounds().size().ToString());
 }
 
 }  // namespace test
 }  // namespace aura_shell