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

chrome/browser/ui/views/accessibility_event_router_views_unittest.cc

Index: chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
===================================================================
--- chrome/browser/ui/views/accessibility_event_router_views_unittest.cc	(revision 124478)
+++ chrome/browser/ui/views/accessibility_event_router_views_unittest.cc	(working copy)
@@ -121,16 +121,15 @@
   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 @@
   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
 };