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

chrome/browser/content_settings/content_settings_notification_provider.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/content_settings/content_settings_notification_provider.h"
 
 #include "base/string_util.h"
-#include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notifications_prefs_cache.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/common/notification_service.h"
@@ skipping 201 matching lines @@
 }
 
 void NotificationProvider::NotifySettingsChange() {
   // TODO(markusheintz): Re-factoring work in progress: Replace the
   // DESKTOP_NOTIFICATION_SETTINGS_CHANGED with a CONTENT_SETTINGS_CHANGED
   // notification, and use the HostContentSettingsMap as source once this
   // content settings provider in integrated in the HostContentSetttingsMap.
   NotificationService::current()->Notify(
       NotificationType::DESKTOP_NOTIFICATION_SETTINGS_CHANGED,
       Source<DesktopNotificationService>(
-          DesktopNotificationServiceFactory::GetForProfile(profile_)),
+          profile_->GetDesktopNotificationService()),
       NotificationService::NoDetails());
 }
 
 std::vector<GURL> NotificationProvider::GetAllowedOrigins() const {
   std::vector<GURL> allowed_origins;
   PrefService* prefs = profile_->GetPrefs();
   const ListValue* allowed_sites =
       prefs->GetList(prefs::kDesktopNotificationAllowedOrigins);
   if (allowed_sites) {
     // TODO(markusheintz): Remove dependency to PrefsCache
@@ skipping 135 matching lines @@
   prefs->ScheduleSavePersistentPrefs();
 }
 
 void NotificationProvider::ResetAllOrigins() {
   PrefService* prefs = profile_->GetPrefs();
   prefs->ClearPref(prefs::kDesktopNotificationAllowedOrigins);
   prefs->ClearPref(prefs::kDesktopNotificationDeniedOrigins);
 }
 
 }  // namespace content_settings