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

chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/notifications/desktop_notifications_unittest.h"
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 94 matching lines @@
 // DesktopNotificationsTest
 
 DesktopNotificationsTest::DesktopNotificationsTest()
     : ui_thread_(BrowserThread::UI, &message_loop_) {
 }
 
 DesktopNotificationsTest::~DesktopNotificationsTest() {
 }
 
 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());
   balloon_collection_ = new MockBalloonCollection();
   ui_manager_.reset(NotificationUIManager::Create(&local_state_,
                                                   balloon_collection_));
   service_.reset(new DesktopNotificationService(profile(), ui_manager_.get()));
   log_output_.clear();
 }
 
 void DesktopNotificationsTest::TearDown() {
   service_.reset(NULL);
   ui_manager_.reset(NULL);
   profile_.reset(NULL);
+#if defined(USE_ASH)
+  ash::Shell::DeleteInstance();
+#endif
 }
 
 content::ShowDesktopNotificationHostMsgParams
 DesktopNotificationsTest::StandardTestNotification() {
   content::ShowDesktopNotificationHostMsgParams params;
   params.notification_id = 0;
   params.origin = GURL("http://www.google.com");
   params.is_html = false;
   params.icon_url = GURL("/icon.png");
   params.title = ASCIIToUTF16("Title");
@@ skipping 169 matching lines @@
 
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(1, balloon_collection_->count());
   Balloon* balloon = (*balloon_collection_->balloons().begin());
   GURL data_url = balloon->notification().content_url();
   EXPECT_EQ(std::string::npos, data_url.spec().find("<script>"));
   EXPECT_EQ(std::string::npos, data_url.spec().find("<i>"));
 }
 
 }  // namespace chromeos