Folds WmRootWindowController into RootWindowController

ash/common/wm_lookup.h

Index: ash/common/wm_lookup.h
diff --git a/ash/common/wm_lookup.h b/ash/common/wm_lookup.h
index e6773608cb396f4ab7648f3e5b0a1948021119f9..c6b4b63b8b0f4e36af90c531f0a830dd011c2d38 100644
--- a/ash/common/wm_lookup.h
+++ b/ash/common/wm_lookup.h
@@ -15,7 +15,7 @@ class Widget;
 
 namespace ash {
 
-class WmRootWindowController;
+class RootWindowController;
 class WmWindow;
 
 // WmLookup is used to lookup various wm types.
@@ -24,9 +24,9 @@ class ASH_EXPORT WmLookup {
   static void Set(WmLookup* lookup);
   static WmLookup* Get();
 
-  // Returns the WmRootWindowController with the specified display id, or null
-  // if there isn't one.
-  virtual WmRootWindowController* GetRootWindowControllerWithDisplayId(
+  // Returns the RootWindowController with the specified display id, or null if
+  // there isn't one.
+  virtual RootWindowController* GetRootWindowControllerWithDisplayId(
       int64_t id) = 0;
 
   // Returns the WmWindow for the specified widget.