Makes WorkspaceLayoutManager use ash/wm/common types

ash/wm/workspace_controller.cc

Index: ash/wm/workspace_controller.cc
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index 4bb8cc7e76a8d6d850673707b2ca6d22fb6e4cae..c6aa952466d7aca361d2b89430a5d07e37d9e0b2 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -10,6 +10,7 @@
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
+#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/common/workspace/workspace_layout_manager_delegate.h"
 #include "ash/wm/window_animations.h"
@@ -18,6 +19,7 @@
 #include "ash/wm/workspace/workspace_event_handler.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
+#include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ -49,11 +51,13 @@ WorkspaceController::WorkspaceController(
       shelf_(NULL),
       event_handler_(new WorkspaceEventHandler),
       layout_manager_(
-          new WorkspaceLayoutManager(viewport, std::move(delegate))) {
+          new WorkspaceLayoutManager(wm::WmWindowAura::Get(viewport),
+                                     std::move(delegate))) {
   SetWindowVisibilityAnimationTransition(
       viewport_, ::wm::ANIMATE_NONE);
 
-  viewport_->SetLayoutManager(layout_manager_);
+  wm::WmWindowAura::Get(viewport_)->SetLayoutManager(
+      base::WrapUnique(layout_manager_));
   viewport_->AddPreTargetHandler(event_handler_.get());
 }