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

chrome/browser/ui/views/accessibility_event_router_views_unittest.cc

 // Copyright (c) 2011 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 <string>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
@@ skipping 103 matching lines @@
   ui::AccessibilityTypes::Role role_;
 };
 
 class AccessibilityEventRouterViewsTest
     : public testing::Test,
       public content::NotificationObserver {
  public:
   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;
 
     // The Widget's FocusManager is deleted using DeleteSoon - this
     // forces it to be deleted now, so we don't have any memory leaks
     // when this method exits.
     MessageLoop::current()->RunAllPending();
   }
 
@@ skipping 15 matching lines @@
     focus_event_count_++;
     last_control_name_ = info->name();
     last_control_context_ = info->context();
   }
 
   MessageLoopForUI message_loop_;
   int focus_event_count_;
   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
 };
 
 TEST_F(AccessibilityEventRouterViewsTest, TestFocusNotification) {
   const char kButton1ASCII[] = "Button1";
   const char kButton2ASCII[] = "Button2";
   const char kButton3ASCII[] = "Button3";
   const char kButton3NewASCII[] = "Button3New";
 
@@ skipping 134 matching lines @@
 
   // Test that we got the event with the expected name and context.
   EXPECT_EQ(1, focus_event_count_);
   EXPECT_EQ(kButtonNameASCII, last_control_name_);
   EXPECT_EQ(kAlertTextASCII, last_control_context_);
 
   window->CloseNow();
 }
 
 #endif  // defined(TOOLKIT_VIEWS)