Revert 81277 - Profile shouldn't own DesktopNotificationService.DesktopNotificationService is now...

chrome/browser/notifications/notification_options_menu_model.cc

 // 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/notifications/notification_options_menu_model.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/balloon_host.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
-#include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/notifications_prefs_cache.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 128 matching lines @@
 string16 NotificationOptionsMenuModel::GetLabelForCommandId(int command_id)
     const {
   // TODO(tfarina,johnnyg): Remove this code if we decide to close notifications
   // after permissions are revoked.
   if (command_id == kTogglePermissionCommand ||
       command_id == kToggleExtensionCommand) {
     const Notification& notification = balloon_->notification();
     const GURL& origin = notification.origin_url();
 
     DesktopNotificationService* service =
-        DesktopNotificationServiceFactory::GetForProfile(balloon_->profile());
+        balloon_->profile()->GetDesktopNotificationService();
     if (origin.SchemeIs(chrome::kExtensionScheme)) {
       ExtensionService* ext_service =
           balloon_->profile()->GetExtensionService();
       const Extension* extension = ext_service->GetExtensionByURL(origin);
       if (extension) {
         ExtensionPrefs* extension_prefs = ext_service->extension_prefs();
         const std::string& id = extension->id();
         if (extension_prefs->GetExtensionState(id) == Extension::ENABLED)
           return l10n_util::GetStringUTF16(IDS_EXTENSIONS_DISABLE);
         else
@@ skipping 29 matching lines @@
 }
 
 bool NotificationOptionsMenuModel::GetAcceleratorForCommandId(
     int /* command_id */, ui::Accelerator* /* accelerator */) {
   // Currently no accelerators.
   return false;
 }
 
 void NotificationOptionsMenuModel::ExecuteCommand(int command_id) {
   DesktopNotificationService* service =
-      DesktopNotificationServiceFactory::GetForProfile(balloon_->profile());
+      balloon_->profile()->GetDesktopNotificationService();
   ExtensionService* ext_service =
       balloon_->profile()->GetExtensionService();
   const GURL& origin = balloon_->notification().origin_url();
   switch (command_id) {
     case kTogglePermissionCommand:
       if (service->GetContentSetting(origin) == CONTENT_SETTING_ALLOW)
         service->DenyPermission(origin);
       else
         service->GrantPermission(origin);
       break;
@@ skipping 14 matching lines @@
           balloon_->view()->GetHost()->associated_tab_contents();
       tab_contents->delegate()->ShowContentSettingsPage(
           CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }