From be8857a9da76bd9428f78f62feffa92bc2918023 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Thu, 1 Mar 2012 21:05:04 +0000 Subject: Revert 124461 - Remove the singleton instance get/delete methods from RootWindow (yay) http://crbug.com/112131 TEST=none Review URL: https://chromiumcodereview.appspot.com/9535025 TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9564023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124479 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/notifications/desktop_notifications_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/notifications/desktop_notifications_unittest.cc') diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc index bea8cdd..c59f0c9 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.cc +++ b/chrome/browser/notifications/desktop_notifications_unittest.cc @@ -95,7 +95,7 @@ void DesktopNotificationsTest::SetUp() { 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::CreateInstance(NULL); + ash::Shell::GetRootWindow(); #endif browser::RegisterLocalState(&local_state_); @@ -112,7 +112,7 @@ void DesktopNotificationsTest::TearDown() { ui_manager_.reset(NULL); profile_.reset(NULL); #if defined(USE_AURA) - ash::Shell::DeleteInstance(); + aura::RootWindow::DeleteInstance(); aura::Env::DeleteInstance(); WebKit::shutdown(); #endif -- cgit v1.1