Revert 124461 - Remove the singleton instance get/delete methods from RootWindow (yay)

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

TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9564023

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

9 files changed, 16 insertions, 21 deletions

diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/chrome_browser_main_extra_parts_aura.cc
index 930dcf1c..6dd359a 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_aura.cc
+++ b/chrome/browser/chrome_browser_main_extra_parts_aura.cc
@@ -77,5 +77,6 @@ void ChromeBrowserMainExtraPartsAura::PostProfileInit() {
 
 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
   ash::Shell::DeleteInstance();
+  aura::RootWindow::DeleteInstance();
   aura::Env::DeleteInstance();
 }
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc
index bea8cdd..c59f0c9 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.cc
+++ b/chrome/browser/notifications/desktop_notifications_unittest.cc
@@ -95,7 +95,7 @@ void DesktopNotificationsTest::SetUp() {
   WebKit::initialize(&webkit_platform_support_);
   // MockBalloonCollection retrieves information about the screen on creation.
   // So it is necessary to make sure the desktop gets created first.
-  ash::Shell::CreateInstance(NULL);
+  ash::Shell::GetRootWindow();
 #endif
 
   browser::RegisterLocalState(&local_state_);
@@ -112,7 +112,7 @@ void DesktopNotificationsTest::TearDown() {
   ui_manager_.reset(NULL);
   profile_.reset(NULL);
 #if defined(USE_AURA)
-  ash::Shell::DeleteInstance();
+  aura::RootWindow::DeleteInstance();
   aura::Env::DeleteInstance();
   WebKit::shutdown();
 #endif
diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
index c6154fc..59e25a8 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
@@ -121,16 +121,15 @@ class AccessibilityEventRouterViewsTest
   virtual void SetUp() {
     views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate();
 #if defined(USE_AURA)
-    root_window_.reset(new aura::RootWindow);
+    aura::RootWindow* root_window = aura::RootWindow::GetInstance();
     test_stacking_client_.reset(
-        new aura::test::TestStackingClient(root_window_.get()));
+        new aura::test::TestStackingClient(root_window));
 #endif
   }
 
   virtual void TearDown() {
 #if defined(USE_AURA)
     test_stacking_client_.reset();
-    root_window_.reset();
 #endif
     delete views::ViewsDelegate::views_delegate;
     views::ViewsDelegate::views_delegate = NULL;
@@ -166,7 +165,6 @@ class AccessibilityEventRouterViewsTest
   std::string last_control_name_;
   std::string last_control_context_;
 #if defined(USE_AURA)
-  scoped_ptr<aura::RootWindow> root_window_;
   scoped_ptr<aura::test::TestStackingClient> test_stacking_client_;
 #endif
 };
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a17d34e..904d4f3 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -740,12 +740,6 @@
                  '../base/allocator/allocator.gyp:allocator',
               ],
             }],
-            ['use_aura==1', {
-              'sources/': [
-                ['exclude', '^browser/accessibility/accessibility_win_browsertest.cc'],
-                ['exclude', '^browser/accessibility/browser_views_accessibility_browsertest.cc'],
-              ],
-            }],
           ],
           'configurations': {
             'Debug_Base': {
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index 1b8fc00..a948f80 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -48,11 +48,11 @@ void BrowserWithTestWindowTest::SetUp() {
   window_.reset(new TestBrowserWindow(browser()));
   browser_->SetWindowForTesting(window_.get());
 #if defined(USE_AURA)
-  root_window_.reset(new aura::RootWindow);
+  aura::RootWindow* root_window = aura::RootWindow::GetInstance();
   test_activation_client_.reset(
-      new aura::test::TestActivationClient(root_window_.get()));
+      new aura::test::TestActivationClient(root_window));
   test_stacking_client_.reset(
-      new aura::test::TestStackingClient(root_window_.get()));
+      new aura::test::TestStackingClient(root_window));
 #endif
 }
 
@@ -61,7 +61,7 @@ void BrowserWithTestWindowTest::TearDown() {
 #if defined(USE_AURA)
   test_activation_client_.reset();
   test_stacking_client_.reset();
-  root_window_.reset();
+  aura::RootWindow::DeleteInstance();
 #endif
 }
 
diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h
index 294f72f..ce46819 100644
--- a/chrome/test/base/browser_with_test_window_test.h
+++ b/chrome/test/base/browser_with_test_window_test.h
@@ -18,7 +18,6 @@ class GURL;
 
 #if defined(USE_AURA)
 namespace aura {
-class RootWindow;
 namespace test {
 class TestActivationClient;
 class TestStackingClient;
@@ -125,7 +124,6 @@ class BrowserWithTestWindowTest : public testing::Test {
   TestRenderViewHostFactory rvh_factory_;
 
 #if defined(USE_AURA)
-  scoped_ptr<aura::RootWindow> root_window_;
   scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
   scoped_ptr<aura::test::TestStackingClient> test_stacking_client_;
 #endif
diff --git a/chrome/test/base/chrome_render_view_host_test_harness.cc b/chrome/test/base/chrome_render_view_host_test_harness.cc
index f9b052f..612d77f 100644
--- a/chrome/test/base/chrome_render_view_host_test_harness.cc
+++ b/chrome/test/base/chrome_render_view_host_test_harness.cc
@@ -33,6 +33,7 @@ void ChromeRenderViewHostTestHarness::TearDown() {
   RenderViewHostTestHarness::TearDown();
 #if defined(USE_AURA)
   ash::Shell::DeleteInstance();
+  aura::RootWindow::DeleteInstance();
   aura::Env::DeleteInstance();
 #endif
 }
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index 667397e..adc81b0 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -278,6 +278,7 @@ void RunMessageLoop() {
   MessageLoop::ScopedNestableTaskAllower allow(loop);
   if (ui_loop) {
 #if defined(USE_AURA)
+    ash::Shell::GetRootWindow()->ShowRootWindow();
     ui_loop->Run();
 #elif defined(TOOLKIT_VIEWS)
     views::AcceleratorHandler handler;
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index de2bb32..b04ab49 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -68,7 +68,7 @@ ViewEventTestBase::ViewEventTestBase()
 void ViewEventTestBase::Done() {
   MessageLoop::current()->Quit();
 
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
   // We need to post a message to tickle the Dispatcher getting called and
   // exiting out of the nested loop. Without this the quit never runs.
   PostMessage(window_->GetNativeWindow(), WM_USER, 0, 0);
@@ -87,6 +87,7 @@ void ViewEventTestBase::SetUp() {
 #endif
   ui::CompositorTestSupport::Initialize();
 #if defined(USE_AURA)
+  ash::Shell::GetRootWindow();
   ash::Shell::CreateInstance(NULL);
 #endif
   window_ = views::Widget::CreateWindow(this);
@@ -94,7 +95,7 @@ void ViewEventTestBase::SetUp() {
 
 void ViewEventTestBase::TearDown() {
   if (window_) {
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
     DestroyWindow(window_->GetNativeWindow());
 #else
     window_->Close();
@@ -104,6 +105,7 @@ void ViewEventTestBase::TearDown() {
   }
 #if defined(USE_AURA)
   ash::Shell::DeleteInstance();
+  aura::RootWindow::DeleteInstance();
   aura::Env::DeleteInstance();
 #endif
   ui::CompositorTestSupport::Terminate();
@@ -143,7 +145,7 @@ void ViewEventTestBase::StartMessageLoopAndRunTest() {
   window_->Show();
   // Make sure the window is the foreground window, otherwise none of the
   // mouse events are going to be targeted correctly.
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
   SetForegroundWindow(window_->GetNativeWindow());
 #endif