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

chrome/test/base/view_event_test_base.cc

Index: chrome/test/base/view_event_test_base.cc
===================================================================
--- chrome/test/base/view_event_test_base.cc	(revision 124527)
+++ chrome/test/base/view_event_test_base.cc	(working copy)
@@ -68,7 +68,7 @@
 void ViewEventTestBase::Done() {
   MessageLoop::current()->Quit();
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // We need to post a message to tickle the Dispatcher getting called and
   // exiting out of the nested loop. Without this the quit never runs.
   PostMessage(window_->GetNativeWindow(), WM_USER, 0, 0);
@@ -87,7 +87,6 @@
 #endif
   ui::CompositorTestSupport::Initialize();
 #if defined(USE_AURA)
-  ash::Shell::GetRootWindow();
   ash::Shell::CreateInstance(NULL);
 #endif
   window_ = views::Widget::CreateWindow(this);
@@ -95,7 +94,7 @@
 
 void ViewEventTestBase::TearDown() {
   if (window_) {
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
     DestroyWindow(window_->GetNativeWindow());
 #else
     window_->Close();
@@ -105,7 +104,6 @@
   }
 #if defined(USE_AURA)
   ash::Shell::DeleteInstance();
-  aura::RootWindow::DeleteInstance();
   aura::Env::DeleteInstance();
 #endif
   ui::CompositorTestSupport::Terminate();
@@ -145,7 +143,7 @@
   window_->Show();
   // Make sure the window is the foreground window, otherwise none of the
   // mouse events are going to be targeted correctly.
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   SetForegroundWindow(window_->GetNativeWindow());
 #endif