diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 21:05:04 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 21:05:04 +0000 |
| commit | be8857a9da76bd9428f78f62feffa92bc2918023 (patch) | |
| tree | f48642693658270ff1214761f3ecd5f6b55c24e0 /chrome/browser/notifications/desktop_notifications_unittest.cc | |
| parent | ee847afb8a3c6cb9efba2c625a8a56083df81afb (diff) | |
| download | chromium_src-be8857a9da76bd9428f78f62feffa92bc2918023.zip chromium_src-be8857a9da76bd9428f78f62feffa92bc2918023.tar.gz chromium_src-be8857a9da76bd9428f78f62feffa92bc2918023.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/notifications/desktop_notifications_unittest.cc')
| -rw-r--r-- | chrome/browser/notifications/desktop_notifications_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 |