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

content/browser/renderer_host/test_render_view_host.cc

Index: content/browser/renderer_host/test_render_view_host.cc
===================================================================
--- content/browser/renderer_host/test_render_view_host.cc	(revision 124527)
+++ content/browser/renderer_host/test_render_view_host.cc	(working copy)
@@ -400,8 +400,9 @@
 
 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());
 }
@@ -410,6 +411,7 @@
   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