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

chrome/browser/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/notifications/desktop_notifications_unittest.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/common/pref_names.h"
@@ skipping 73 matching lines @@
 }
 
 DesktopNotificationsTest::DesktopNotificationsTest()
     : ui_thread_(BrowserThread::UI, &message_loop_) {
 }
 
 DesktopNotificationsTest::~DesktopNotificationsTest() {
 }
 
 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_);
   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_AURA)
-  aura::RootWindow::DeleteInstance();
+#if defined(USE_ASH)
+  ash::Shell::DeleteInstance();
   aura::Env::DeleteInstance();
   WebKit::shutdown();
 #endif
 }
 
 content::ShowDesktopNotificationHostMsgParams
 DesktopNotificationsTest::StandardTestNotification() {
   content::ShowDesktopNotificationHostMsgParams params;
   params.notification_id = 0;
   params.origin = GURL("http://www.google.com");
@@ skipping 339 matching lines @@
   }
 
   // Now change the position to upper left.  Confirm that the X value for the
   // balloons gets smaller.
   local_state_.SetInteger(prefs::kDesktopNotificationPosition,
                           BalloonCollection::UPPER_LEFT);
 
   int current_x = (*balloons.begin())->GetPosition().x();
   EXPECT_LT(current_x, last_x);
 }