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

2 files changed, 2 insertions, 6 deletions

diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc
index d29c0ce..721de95 100644
--- a/content/browser/renderer_host/test_render_view_host.cc
+++ b/content/browser/renderer_host/test_render_view_host.cc
@@ -400,9 +400,8 @@ void RenderViewHostTestHarness::Reload() {
 
 void RenderViewHostTestHarness::SetUp() {
 #if defined(USE_AURA)
-  root_window_.reset(new aura::RootWindow);
-  test_stacking_client_.reset(
-      new aura::test::TestStackingClient(root_window_.get()));
+  aura::RootWindow* root_window = aura::RootWindow::GetInstance();
+  test_stacking_client_.reset(new aura::test::TestStackingClient(root_window));
 #endif
   SetContents(CreateTestTabContents());
 }
@@ -411,7 +410,6 @@ 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
diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h
index 029c748..dec9719 100644
--- a/content/browser/renderer_host/test_render_view_host.h
+++ b/content/browser/renderer_host/test_render_view_host.h
@@ -19,7 +19,6 @@
 
 #if defined(USE_AURA)
 namespace aura {
-class RootWindow;
 namespace test {
 class TestStackingClient;
 }
@@ -375,7 +374,6 @@ class RenderViewHostTestHarness : public testing::Test {
  private:
   scoped_ptr<TestTabContents> contents_;
 #if defined(USE_AURA)
-  scoped_ptr<aura::RootWindow> root_window_;
   scoped_ptr<aura::test::TestStackingClient> test_stacking_client_;
 #endif