ash: Remove wm::GetRootWindowController.

ash/display/display_controller.cc

Index: ash/display/display_controller.cc
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc
index a4807ae7e5f18eb887b9a0349c76bda899dda640..9016725e5446108dd0cd9b8dc55cfd05f93ad3f1 100644
--- a/ash/display/display_controller.cc
+++ b/ash/display/display_controller.cc
@@ -9,6 +9,7 @@
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
+#include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "ui/aura/env.h"
@@ -32,7 +33,7 @@ DisplayController::~DisplayController() {
   for (std::map<int, aura::RootWindow*>::const_reverse_iterator it =
            root_windows_.rbegin(); it != root_windows_.rend(); ++it) {
     internal::RootWindowController* controller =
-        wm::GetRootWindowController(it->second);
+        GetRootWindowController(it->second);
     // RootWindow may not have RootWindowController in non
     // extended desktop mode.
     if (controller)
@@ -76,7 +77,7 @@ void DisplayController::CloseChildWindows() {
            root_windows_.begin(); it != root_windows_.end(); ++it) {
     aura::RootWindow* root_window = it->second;
     internal::RootWindowController* controller =
-        wm::GetRootWindowController(root_window);
+        GetRootWindowController(root_window);
     if (controller) {
       controller->CloseChildWindows();
     } else {
@@ -93,7 +94,7 @@ std::vector<aura::RootWindow*> DisplayController::GetAllRootWindows() {
   for (std::map<int, aura::RootWindow*>::const_iterator it =
            root_windows_.begin(); it != root_windows_.end(); ++it) {
     DCHECK(it->second);
-    if (wm::GetRootWindowController(it->second))
+    if (GetRootWindowController(it->second))
       windows.push_back(it->second);
   }
   return windows;
@@ -105,7 +106,7 @@ DisplayController::GetAllRootWindowControllers() {
   for (std::map<int, aura::RootWindow*>::const_iterator it =
            root_windows_.begin(); it != root_windows_.end(); ++it) {
     internal::RootWindowController* controller =
-        wm::GetRootWindowController(it->second);
+        GetRootWindowController(it->second);
     if (controller)
       controllers.push_back(controller);
   }
@@ -217,7 +218,7 @@ void DisplayController::OnDisplayRemoved(const gfx::Display& display) {
   if (root != Shell::GetPrimaryRootWindow()) {
     root_windows_.erase(display.id());
     internal::RootWindowController* controller =
-        wm::GetRootWindowController(root);
+        GetRootWindowController(root);
     if (controller) {
       controller->MoveWindowsTo(Shell::GetPrimaryRootWindow());
       delete controller;