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

chrome/browser/notifications/desktop_notifications_unittest.cc

Index: chrome/browser/notifications/desktop_notifications_unittest.cc
===================================================================
--- chrome/browser/notifications/desktop_notifications_unittest.cc	(revision 124527)
+++ chrome/browser/notifications/desktop_notifications_unittest.cc	(working copy)
@@ -91,11 +91,11 @@
 }
 
 void DesktopNotificationsTest::SetUp() {
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   WebKit::initialize(&webkit_platform_support_);
   // MockBalloonCollection retrieves information about the screen on creation.
   // So it is necessary to make sure the desktop gets created first.
-  ash::Shell::GetRootWindow();
+  ash::Shell::CreateInstance(NULL);
 #endif
 
   browser::RegisterLocalState(&local_state_);
@@ -111,8 +111,8 @@
   service_.reset(NULL);
   ui_manager_.reset(NULL);
   profile_.reset(NULL);
-#if defined(USE_AURA)
-  aura::RootWindow::DeleteInstance();
+#if defined(USE_ASH)
+  ash::Shell::DeleteInstance();
   aura::Env::DeleteInstance();
   WebKit::shutdown();
 #endif