Cleanup: Remove OptionsUtil::ResetToDefaults() function.

No one more uses this function after we removed the platform-specific code and
switched to WebUI.

(Note: This was a TODO for kmadhusu).

BUG=None
TEST=None

R=thestig@chromium.org,kmadhusu@chromium.org

Review URL: http://codereview.chromium.org/6894015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82638 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 2 insertions, 149 deletions

diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
index cab7cbde..281adf4 100644
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -117,11 +117,6 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(const FilePath& file_name) {
   SaveAutoOpenState();
 }
 
-void DownloadPrefs::ResetToDefaults() {
-  // TODO(phajdan.jr): Should we reset rest of prefs here?
-  ResetAutoOpen();
-}
-
 void DownloadPrefs::ResetAutoOpen() {
   auto_open_.clear();
   SaveAutoOpenState();
diff --git a/chrome/browser/download/download_prefs.h b/chrome/browser/download/download_prefs.h
index 8bcebfe..cd7bad4 100644
--- a/chrome/browser/download/download_prefs.h
+++ b/chrome/browser/download/download_prefs.h
@@ -46,7 +46,6 @@ class DownloadPrefs {
   // Disables auto-open based on file extension.
   void DisableAutoOpenBasedOnExtension(const FilePath& file_name);
 
-  void ResetToDefaults();
   void ResetAutoOpen();
 
  private:
diff --git a/chrome/browser/ui/options/options_util.cc b/chrome/browser/ui/options/options_util.cc
index bed21ab..733d65e 100644
--- a/chrome/browser/ui/options/options_util.cc
+++ b/chrome/browser/ui/options/options_util.cc
@@ -6,106 +6,8 @@
 
 #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
-  // manually.
-  PrefService* prefs = profile->GetPrefs();
-  const char* kUserPrefs[] = {
-    prefs::kAcceptLanguages,
-    prefs::kAlternateErrorPagesEnabled,
-    prefs::kClearSiteDataOnExit,
-    prefs::kCookieBehavior,
-    prefs::kDefaultCharset,
-    prefs::kDefaultZoomLevel,
-    prefs::kDeleteBrowsingHistory,
-    prefs::kDeleteCache,
-    prefs::kDeleteCookies,
-    prefs::kDeleteDownloadHistory,
-    prefs::kDeleteFormData,
-    prefs::kDeletePasswords,
-    prefs::kNetworkPredictionEnabled,
-    // TODO(rtenneti): Remove ssl preferences from user_prefs when we stop
-    // migrating user_prefs to local_state after 6 months (after we delete
-    // migration code).
-    prefs::kCertRevocationCheckingEnabled,
-    prefs::kSSL3Enabled,
-    prefs::kTLS1Enabled,
-#if defined(OS_CHROMEOS)
-    prefs::kTapToClickEnabled,
-    prefs::kTouchpadSensitivity,
-#endif
-    prefs::kDownloadDefaultDirectory,
-    prefs::kDownloadExtensionsToOpen,
-    prefs::kSavingBrowserHistoryDisabled,
-    prefs::kEnableSpellCheck,
-    prefs::kEnableTranslate,
-    prefs::kAutofillEnabled,
-    prefs::kAutofillAuxiliaryProfilesEnabled,
-    prefs::kHomePage,
-    prefs::kHomePageIsNewTabPage,
-    prefs::kPromptForDownload,
-    prefs::kPasswordManagerEnabled,
-    prefs::kRestoreOnStartup,
-    prefs::kSafeBrowsingEnabled,
-    prefs::kSafeBrowsingReportingEnabled,
-    prefs::kSearchSuggestEnabled,
-    prefs::kShowHomeButton,
-    prefs::kSpellCheckDictionary,
-    prefs::kURLsToRestoreOnStartup,
-    prefs::kWebKitDefaultFixedFontSize,
-    prefs::kWebKitDefaultFontSize,
-    prefs::kWebKitFixedFontFamily,
-    prefs::kWebKitJavaEnabled,
-    prefs::kWebKitJavascriptEnabled,
-    prefs::kWebKitLoadsImagesAutomatically,
-    prefs::kWebKitPluginsEnabled,
-    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();
-  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
-  // don't reset it.
-  const char* kLocalStatePrefs[] = {
-    prefs::kApplicationLocale,
-    prefs::kCertRevocationCheckingEnabled,
-    prefs::kSSL3Enabled,
-    prefs::kTLS1Enabled,
-  };
-  for (size_t i = 0; i < arraysize(kLocalStatePrefs); ++i)
-    local_state->ClearPref(kLocalStatePrefs[i]);
-}
 
 // static
 bool OptionsUtil::ResolveMetricsReportingEnabled(bool enabled) {
@@ -116,9 +18,8 @@ bool OptionsUtil::ResolveMetricsReportingEnabled(bool enabled) {
   GoogleUpdateSettings::SetCollectStatsConsent(enabled);
   bool update_pref = GoogleUpdateSettings::GetCollectStatsConsent();
 
-  if (enabled != update_pref) {
+  if (enabled != update_pref)
     DVLOG(1) << "OptionsUtil: Unable to set crash report status to " << enabled;
-  }
 
   // Only change the pref if GoogleUpdateSettings::GetCollectStatsConsent
   // succeeds.
diff --git a/chrome/browser/ui/options/options_util.h b/chrome/browser/ui/options/options_util.h
index fb2b183..8bae87b 100644
--- a/chrome/browser/ui/options/options_util.h
+++ b/chrome/browser/ui/options/options_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -8,15 +8,8 @@
 
 #include "base/basictypes.h"
 
-class Profile;
-
 class OptionsUtil {
  public:
-  // TODO(kmadhusu): Remove "ResetToDefaults" function after platform-specific
-  // dialogs are removed.
-  // Resets all prefs to their default values.
-  static void ResetToDefaults(Profile* profile);
-
   // Try to make the the crash stats consent and the metrics upload
   // permission match |enabled|, returns the actual enabled setting.
   static bool ResolveMetricsReportingEnabled(bool enabled);
diff --git a/content/browser/host_zoom_map.cc b/content/browser/host_zoom_map.cc
index 523d6d7..3d50403 100644
--- a/content/browser/host_zoom_map.cc
+++ b/content/browser/host_zoom_map.cc
@@ -188,21 +188,6 @@ void HostZoomMap::SetTemporaryZoomLevel(int render_process_id,
                                          NotificationService::NoDetails());
 }
 
-void HostZoomMap::ResetToDefaults() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (!profile_)
-    return;
-
-  {
-    base::AutoLock auto_lock(lock_);
-    host_zoom_levels_.clear();
-  }
-
-  updating_preferences_ = true;
-  profile_->GetPrefs()->ClearPref(prefs::kPerHostZoomLevels);
-  updating_preferences_ = false;
-}
-
 void HostZoomMap::Shutdown() {
   if (!profile_)
     return;
diff --git a/content/browser/host_zoom_map.h b/content/browser/host_zoom_map.h
index 689d2b9..ebe3582 100644
--- a/content/browser/host_zoom_map.h
+++ b/content/browser/host_zoom_map.h
@@ -68,11 +68,6 @@ class HostZoomMap :
                              int render_view_id,
                              double level);
 
-  // Resets all zoom levels.
-  //
-  // This should only be called on the UI thread.
-  void ResetToDefaults();
-
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
diff --git a/content/browser/host_zoom_map_unittest.cc b/content/browser/host_zoom_map_unittest.cc
index 30f092d..c676a53 100644
--- a/content/browser/host_zoom_map_unittest.cc
+++ b/content/browser/host_zoom_map_unittest.cc
@@ -92,21 +92,6 @@ TEST_F(HostZoomMapTest, SetZoomLevel) {
   EXPECT_FALSE(dict->HasKey(host_));
 }
 
-TEST_F(HostZoomMapTest, ResetToDefaults) {
-  scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
-  map->SetZoomLevel(url_, kZoomLevel);
-
-  PrefChangeRegistrar registrar;
-  registrar.Init(prefs_);
-  registrar.Add(prefs::kPerHostZoomLevels, &pref_observer_);
-  SetPrefObserverExpectation();
-  map->ResetToDefaults();
-  EXPECT_EQ(0, map->GetZoomLevel(url_));
-  DictionaryValue empty;
-  EXPECT_TRUE(
-      Value::Equals(&empty, prefs_->GetDictionary(prefs::kPerHostZoomLevels)));
-}
-
 TEST_F(HostZoomMapTest, ReloadOnPrefChange) {
   scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
   map->SetZoomLevel(url_, kZoomLevel);