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

chrome/browser/ui/options/options_util.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/ui/options/options_util.h"
 
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
-#include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/browser/host_zoom_map.h"
 
 // static
 void OptionsUtil::ResetToDefaults(Profile* profile) {
   // TODO(tc): It would be nice if we could generate this list automatically so
   // changes to any of the options pages doesn't require updating this list
@@ skipping 51 matching lines @@
     prefs::kWebKitSansSerifFontFamily,
     prefs::kWebKitSerifFontFamily,
     prefs::kWebKitMinimumFontSize,
     prefs::kWebKitMinimumLogicalFontSize,
     prefs::kWebkitTabsToLinks,
   };
   profile->GetDownloadManager()->download_prefs()->ResetToDefaults();
   profile->GetHostContentSettingsMap()->ResetToDefaults();
   profile->GetGeolocationContentSettingsMap()->ResetToDefault();
   profile->GetHostZoomMap()->ResetToDefaults();
-  DesktopNotificationServiceFactory::GetForProfile(profile)->
-      ResetToDefaultContentSetting();
+  profile->GetDesktopNotificationService()->ResetToDefaultContentSetting();
   for (size_t i = 0; i < arraysize(kUserPrefs); ++i)
     prefs->ClearPref(kUserPrefs[i]);
 
   PrefService* local_state = g_browser_process->local_state();
   // Note that we don't reset the kMetricsReportingEnabled preference here
   // because the reset will reset it to the default setting specified in Chrome
   // source, not the default setting selected by the user on the web page where
   // they downloaded Chrome. This means that if the user ever resets their
   // settings they'll either inadvertedly enable this logging or disable it.
   // One is undesirable for them, one is undesirable for us. For now, we just
@@ skipping 30 matching lines @@
   if (metrics) {
     metrics->SetUserPermitsUpload(enabled);
     if (enabled)
       metrics->Start();
     else
       metrics->Stop();
   }
 
   return enabled;
 }