diff options
author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 18:48:17 +0000 |
---|---|---|
committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 18:48:17 +0000 |
commit | 7211f74d2f66c46507e235b39245f736420e68d1 (patch) | |
tree | ea8f2a932730dd902540f8e9ce2cb79db4b654c8 /chrome/browser/extensions/notifications_apitest.cc | |
parent | 413a8e22c2ff986d335cdc9b86f78a6716a52975 (diff) | |
download | chromium_src-7211f74d2f66c46507e235b39245f736420e68d1.zip chromium_src-7211f74d2f66c46507e235b39245f736420e68d1.tar.gz chromium_src-7211f74d2f66c46507e235b39245f736420e68d1.tar.bz2 |
Profile shouldn't own DesktopNotificationService.
DesktopNotificationService is now owned by
DesktopNotificationServiceFactory, using Profile as a key. This uses the
ProfileKeyedService infrastructure originally created for
ThemeServiceFactory.
BUG=77155
TEST=existing tests
Review URL: http://codereview.chromium.org/6803012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/notifications_apitest.cc')
-rw-r--r-- | chrome/browser/extensions/notifications_apitest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/notifications_apitest.cc b/chrome/browser/extensions/notifications_apitest.cc index 7e2a34d..22eea07 100644 --- a/chrome/browser/extensions/notifications_apitest.cc +++ b/chrome/browser/extensions/notifications_apitest.cc @@ -1,10 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/extensions/extension_apitest.h" #include "chrome/browser/notifications/desktop_notification_service.h" +#include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -16,11 +17,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_Notifications) { ASSERT_TRUE(RunExtensionTest("notifications/has_not_permission")) << message_; ASSERT_TRUE(RunExtensionTest("notifications/has_permission_manifest")) << message_; - browser()->profile()->GetDesktopNotificationService() + DesktopNotificationServiceFactory::GetForProfile(browser()->profile()) ->GrantPermission(GURL( "chrome-extension://peoadpeiejnhkmpaakpnompolbglelel")); ASSERT_TRUE(RunExtensionTest("notifications/has_permission_prefs")) << message_; #endif } - |