Replace RootWindow::GetInstance() usage in a bunch of tests with a new root_window() accessor exposed on AuraTestBase.

Also fixes one place in window.cc to use GetRootWindow() rather than RootWindow::GetInstance().

http://crbug.com/112131
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9421009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122634 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index 57316c7..576fac6 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -10,14 +10,14 @@
 namespace aura {
 namespace test {
 
-AuraTestBase::AuraTestBase() {
-  helper_.InitRootWindow(RootWindow::GetInstance());
+AuraTestBase::AuraTestBase() : root_window_(RootWindow::GetInstance()) {
+  helper_.InitRootWindow(root_window_);
 }
 
 AuraTestBase::~AuraTestBase() {
   // Flush the message loop because we have pending release tasks
   // and these tasks if un-executed would upset Valgrind.
-  helper_.RunAllPendingInMessageLoop(RootWindow::GetInstance());
+  helper_.RunAllPendingInMessageLoop(root_window_);
 
   // Ensure that we don't use the previously-allocated static RootWindow object
   // later -- on Linux, it holds a reference to our message loop's X connection.
@@ -35,7 +35,7 @@ void AuraTestBase::TearDown() {
 }
 
 void AuraTestBase::RunAllPendingInMessageLoop() {
-  helper_.RunAllPendingInMessageLoop(RootWindow::GetInstance());
+  helper_.RunAllPendingInMessageLoop(root_window_);
 }
 
 }  // namespace test