Nix GetRootWindowController, use RootWindowController::ForWindow.

ash/display/extended_mouse_warp_controller.cc

 // Copyright 2015 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 "ash/display/extended_mouse_warp_controller.h"
 
 #include <cmath>
 
 #include "ash/display/display_util.h"
 #include "ash/display/shared_display_edge_indicator.h"
@@ skipping 59 matching lines @@
     const gfx::Rect& b_indicator_bounds)
     : a_display_id_(a_display_id),
       b_display_id_(b_display_id),
       a_indicator_bounds_(a_indicator_bounds),
       b_indicator_bounds_(b_indicator_bounds),
       shared_display_edge_indicator_(nullptr) {
   // Initialize edge bounds from indicator bounds.
   aura::Window* a_window = GetRootWindowForDisplayId(a_display_id);
   aura::Window* b_window = GetRootWindowForDisplayId(b_display_id);
 
-  AshWindowTreeHost* a_ash_host = GetRootWindowController(a_window)->ash_host();
-  AshWindowTreeHost* b_ash_host = GetRootWindowController(b_window)->ash_host();
+  AshWindowTreeHost* a_ash_host =
+      RootWindowController::ForWindow(a_window)->ash_host();
+  AshWindowTreeHost* b_ash_host =
+      RootWindowController::ForWindow(b_window)->ash_host();
 
   a_edge_bounds_in_native_ =
       GetNativeEdgeBounds(a_ash_host, a_indicator_bounds);
   b_edge_bounds_in_native_ =
       GetNativeEdgeBounds(b_ash_host, b_indicator_bounds);
 }
 
 ExtendedMouseWarpController::WarpRegion::~WarpRegion() {}
 
 const gfx::Rect&
@@ skipping 90 matching lines @@
   for (const std::unique_ptr<WarpRegion>& warp : warp_regions_) {
     bool in_a_edge = warp->a_edge_bounds_in_native_.Contains(point_in_native);
     bool in_b_edge = warp->b_edge_bounds_in_native_.Contains(point_in_native);
     if (!in_a_edge && !in_b_edge)
       continue;
 
     // The mouse must move.
     aura::Window* dst_window = GetRootWindowForDisplayId(
         in_a_edge ? warp->b_display_id_ : warp->a_display_id_);
     AshWindowTreeHost* target_ash_host =
-        GetRootWindowController(dst_window)->ash_host();
+        RootWindowController::ForWindow(dst_window)->ash_host();
 
     MoveCursorTo(target_ash_host, point_in_screen, update_mouse_location_now);
     return true;
   }
 
   return false;
 }
 
 std::unique_ptr<ExtendedMouseWarpController::WarpRegion>
 ExtendedMouseWarpController::CreateWarpRegion(const display::Display& a,
@@ skipping 12 matching lines @@
     if (drag_source_id == a.id())
       AdjustSourceEdgeBounds(a.bounds(), snap_barrier, &a_edge);
     else if (drag_source_id == b.id())
       AdjustSourceEdgeBounds(b.bounds(), snap_barrier, &b_edge);
   }
 
   return base::MakeUnique<WarpRegion>(a.id(), b.id(), a_edge, b_edge);
 }
 
 }  // namespace ash