Folds WmRootWindowController into RootWindowController

ash/common/wm/window_positioning_utils.cc

Index: ash/common/wm/window_positioning_utils.cc
diff --git a/ash/common/wm/window_positioning_utils.cc b/ash/common/wm/window_positioning_utils.cc
index 02ef979584159a57c0edc67744df51320a5c762c..aac2949383505fd7346dd8621de1138098bb3906 100644
--- a/ash/common/wm/window_positioning_utils.cc
+++ b/ash/common/wm/window_positioning_utils.cc
@@ -11,10 +11,10 @@
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_lookup.h"
-#include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_tracker.h"
+#include "ash/root_window_controller.h"
 #include "ui/display/display.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
@@ -138,7 +138,7 @@ void SetBoundsInScreen(WmWindow* window,
   //    display.
   if (!window->GetTransientParent() &&
       !IsWindowOrAncestorLockedToRoot(window)) {
-    WmRootWindowController* dst_root_window_controller =
+    RootWindowController* dst_root_window_controller =
         WmLookup::Get()->GetRootWindowControllerWithDisplayId(display.id());
     DCHECK(dst_root_window_controller);
     WmWindow* dst_root = dst_root_window_controller->GetWindow();