Nix GetRootWindowController, use RootWindowController::ForWindow.

ash/extended_desktop_unittest.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/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/root_window_finder.h"
@@ skipping 146 matching lines @@
     params.context = context;
     params.bounds = bounds;
     params.child = child;
     views::Widget* widget = new views::Widget;
     widget->Init(params);
     widget->Show();
     return widget;
   }
 };
 
-// Test conditions that root windows in extended desktop mode
-// must satisfy.
+// Test conditions that root windows in extended desktop mode must satisfy.
 TEST_F(ExtendedDesktopTest, Basic) {
   UpdateDisplay("1000x600,600x400");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
-  // All root windows must have the root window controller.
+  // All root windows must have a root window controller.
   ASSERT_EQ(2U, root_windows.size());
-  for (aura::Window::Windows::const_iterator iter = root_windows.begin();
-       iter != root_windows.end(); ++iter) {
-    EXPECT_TRUE(GetRootWindowController(*iter) != nullptr);
-  }
+  EXPECT_TRUE(RootWindowController::ForWindow(root_windows[0]));
+  EXPECT_TRUE(RootWindowController::ForWindow(root_windows[1]));
   // Make sure root windows share the same controllers.
   EXPECT_EQ(aura::client::GetFocusClient(root_windows[0]),
             aura::client::GetFocusClient(root_windows[1]));
   EXPECT_EQ(::wm::GetActivationClient(root_windows[0]),
             ::wm::GetActivationClient(root_windows[1]));
   EXPECT_EQ(aura::client::GetCaptureClient(root_windows[0]),
             aura::client::GetCaptureClient(root_windows[1]));
 }
 
 TEST_F(ExtendedDesktopTest, Activation) {
@@ skipping 654 matching lines @@
   generator.ReleaseLeftButton();
   EXPECT_EQ("-999,-999 -999,-999", event_handler.GetLocationsAndReset());
 
   generator.MoveMouseTo(400, 150);
   EXPECT_EQ("100,150 100,150", event_handler.GetLocationsAndReset());
 
   ash::Shell::Get()->RemovePreTargetHandler(&event_handler);
 }
 
 }  // namespace ash