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

chrome/test/base/browser_with_test_window_test.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 "chrome/test/base/browser_with_test_window_test.h"
 
 #if defined(OS_WIN)
 #include <ole2.h>
 #endif  // defined(OS_WIN)
 
@@ skipping 30 matching lines @@
 }
 
 void BrowserWithTestWindowTest::SetUp() {
   testing::Test::SetUp();
 
   profile_.reset(CreateProfile());
   browser_.reset(new Browser(Browser::TYPE_TABBED, profile()));
   window_.reset(new TestBrowserWindow(browser()));
   browser_->SetWindowForTesting(window_.get());
 #if defined(USE_AURA)
-  aura::RootWindow* root_window = aura::RootWindow::GetInstance();
+  root_window_.reset(new aura::RootWindow);
   test_activation_client_.reset(
-      new aura::test::TestActivationClient(root_window));
+      new aura::test::TestActivationClient(root_window_.get()));
   test_stacking_client_.reset(
-      new aura::test::TestStackingClient(root_window));
+      new aura::test::TestStackingClient(root_window_.get()));
 #endif
 }
 
 void BrowserWithTestWindowTest::TearDown() {
   testing::Test::TearDown();
 #if defined(USE_AURA)
   test_activation_client_.reset();
   test_stacking_client_.reset();
-  aura::RootWindow::DeleteInstance();
+  root_window_.reset();
 #endif
 }
 
 BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {
   // A Task is leaked if we don't destroy everything, then run the message
   // loop.
   DestroyBrowser();
   profile_.reset(NULL);
 
   MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
@@ skipping 78 matching lines @@
   // Make sure we close all tabs, otherwise Browser isn't happy in its
   // destructor.
   browser()->CloseAllTabs();
   browser_.reset(NULL);
   window_.reset(NULL);
 }
 
 TestingProfile* BrowserWithTestWindowTest::CreateProfile() {
   return new TestingProfile();
 }