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

content/browser/renderer_host/test_render_view_host.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 "content/browser/browser_url_handler.h"
 #include "content/browser/renderer_host/test_backing_store.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/tab_contents/navigation_controller_impl.h"
 #include "content/browser/tab_contents/navigation_entry_impl.h"
@@ skipping 382 matching lines @@
 
 void RenderViewHostTestHarness::Reload() {
   NavigationEntry* entry = controller().GetLastCommittedEntry();
   DCHECK(entry);
   controller().Reload(false);
   rvh()->SendNavigate(entry->GetPageID(), entry->GetURL());
 }
 
 void RenderViewHostTestHarness::SetUp() {
 #if defined(USE_AURA)
-  aura::RootWindow* root_window = aura::RootWindow::GetInstance();
-  test_stacking_client_.reset(new aura::test::TestStackingClient(root_window));
+  root_window_.reset(new aura::RootWindow);
+  test_stacking_client_.reset(
+      new aura::test::TestStackingClient(root_window_.get()));
 #endif
   SetContents(CreateTestTabContents());
 }
 
 void RenderViewHostTestHarness::TearDown() {
   SetContents(NULL);
 #if defined(USE_AURA)
   test_stacking_client_.reset();
+  root_window_.reset();
 #endif
 
   // Make sure that we flush any messages related to TabContents destruction
   // before we destroy the browser context.
   MessageLoop::current()->RunAllPending();
 
   // Release the browser context on the UI thread.
   message_loop_.DeleteSoon(FROM_HERE, browser_context_.release());
   message_loop_.RunAllPending();
 }