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

chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc

Index: chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc
===================================================================
--- chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc	(revision 124527)
+++ chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc	(working copy)
@@ -112,9 +112,9 @@
 }
 
 void DesktopNotificationsTest::SetUp() {
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   // Make sure a root window has been instantiated.
-  ash::Shell::GetRootWindow();
+  ash::Shell::CreateInstance(NULL);
 #endif
   browser::RegisterLocalState(&local_state_);
   profile_.reset(new TestingProfile());
@@ -129,6 +129,9 @@
   service_.reset(NULL);
   ui_manager_.reset(NULL);
   profile_.reset(NULL);
+#if defined(USE_ASH)
+  ash::Shell::DeleteInstance();
+#endif
 }
 
 content::ShowDesktopNotificationHostMsgParams