Nix GetRootWindowController, use RootWindowController::ForWindow.

ash/touch/touch_observer_hud.cc

 // Copyright (c) 2012 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/touch/touch_observer_hud.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/shell.h"
@@ skipping 47 matching lines @@
   display::Screen::GetScreen()->RemoveObserver(this);
 
   widget_->RemoveObserver(this);
 }
 
 void TouchObserverHUD::Clear() {}
 
 void TouchObserverHUD::Remove() {
   root_window_->RemovePreTargetHandler(this);
 
-  RootWindowController* controller = GetRootWindowController(root_window_);
+  RootWindowController* controller =
+      RootWindowController::ForWindow(root_window_);
   UnsetHudForRootWindowController(controller);
 
   widget_->CloseNow();
 }
 
 void TouchObserverHUD::OnTouchEvent(ui::TouchEvent* /*event*/) {}
 
 void TouchObserverHUD::OnWidgetDestroying(views::Widget* widget) {
   DCHECK_EQ(widget, widget_);
   delete this;
@@ skipping 25 matching lines @@
 void TouchObserverHUD::OnDisplaysInitialized() {
   OnDisplayConfigurationChanged();
 }
 
 void TouchObserverHUD::OnDisplayConfigurationChanging() {
   if (!root_window_)
     return;
 
   root_window_->RemovePreTargetHandler(this);
 
-  RootWindowController* controller = GetRootWindowController(root_window_);
+  RootWindowController* controller =
+      RootWindowController::ForWindow(root_window_);
   UnsetHudForRootWindowController(controller);
 
   views::Widget::ReparentNativeView(
       widget_->GetNativeView(),
       Shell::GetContainer(root_window_,
                           kShellWindowId_UnparentedControlContainer));
 
   root_window_ = NULL;
 }
 
 void TouchObserverHUD::OnDisplayConfigurationChanged() {
   if (root_window_)
     return;
 
   root_window_ =
       Shell::Get()->window_tree_host_manager()->GetRootWindowForDisplayId(
           display_id_);
 
   views::Widget::ReparentNativeView(
       widget_->GetNativeView(),
       Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer));
 
-  RootWindowController* controller = GetRootWindowController(root_window_);
+  RootWindowController* controller =
+      RootWindowController::ForWindow(root_window_);
   SetHudForRootWindowController(controller);
 
   root_window_->AddPreTargetHandler(this);
 }
 
 }  // namespace ash