Reset profile: unpin all pinned tabs

chrome/browser/ui/webui/options/reset_profile_settings_handler.cc

Index: chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
index 87cf054381ac0e295dbf06020b0f3e3bbd638f09..32012fc61f7304fa6cbc5a5f2dcd66ba82178960 100644
--- a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
@@ -40,15 +40,6 @@ void ResetProfileSettingsHandler::GetLocalizedValues(
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
-    { "resetProfileSettingsLabel", IDS_RESET_PROFILE_SETTINGS_LABEL },
-    { "resetDefaultSearchEngineCheckbox",
-       IDS_RESET_PROFILE_DEFAULT_SEARCH_ENGINE_CHECKBOX },
-    { "resetStartupAndHomepageCheckbox",
-       IDS_RESET_PROFILE_STARTUP_HOMEPAGE_CHECKBOX },
-    { "resetContentSettingsCheckbox",
-       IDS_RESET_PROFILE_CONTENT_SETTINGS_CHECKBOX },
-    { "resetCookiesAndSiteDataCheckbox", IDS_RESET_PROFILE_COOKIES_CHECKBOX },
-    { "resetExtensionsCheckbox", IDS_RESET_PROFILE_EXTENSIONS_CHECKBOX },
     { "resetProfileSettingsCommit", IDS_RESET_PROFILE_SETTINGS_COMMIT_BUTTON },
   };
 
@@ -59,27 +50,6 @@ void ResetProfileSettingsHandler::GetLocalizedValues(
       "resetProfileSettingsLearnMoreUrl",
       google_util::StringAppendGoogleLocaleParam(
           kResetProfileSettingsLearnMoreUrl));
-
-  scoped_ptr<ListValue> reset_extensions_handling(new ListValue);
-  for (int i = 0; i < 2; i++) {
-    string16 label_string;
-    switch (i) {
-      case 0:
-        label_string = l10n_util::GetStringUTF16(
-            IDS_RESET_PROFILE_EXTENSIONS_DISABLE);
-        break;
-      case 1:
-        label_string = l10n_util::GetStringUTF16(
-            IDS_RESET_PROFILE_EXTENSIONS_UNINSTALL);
-        break;
-    }
-    scoped_ptr<ListValue> option(new ListValue);
-    option->Append(new base::FundamentalValue(i));
-    option->Append(new base::StringValue(label_string));
-    reset_extensions_handling->Append(option.release());
-  }
-  localized_strings->Set("resetExtensionsHandling",
-                         reset_extensions_handling.release());
 }
 
 void ResetProfileSettingsHandler::RegisterMessages() {
@@ -94,36 +64,8 @@ void ResetProfileSettingsHandler::HandleResetProfileSettings(
   DCHECK(resetter_);
   DCHECK(!resetter_->IsActive());
 
-  Profile* profile = Profile::FromWebUI(web_ui());
-  PrefService* prefs = profile->GetPrefs();
-
-  ProfileResetter::ResettableFlags reset_mask = 0;
-
-  struct {
-    const char* flag_name;
-    ProfileResetter::ResettableFlags mask;
-  } name_to_flag[] = {
-    { prefs::kResetDefaultSearchEngine,
-      ProfileResetter::DEFAULT_SEARCH_ENGINE },
-    { prefs::kResetHomepage, ProfileResetter::HOMEPAGE |
-                             ProfileResetter::STARTUP_PAGE },
-    { prefs::kResetContentSettings, ProfileResetter::CONTENT_SETTINGS },
-    { prefs::kResetCookiesAndSiteData, ProfileResetter::COOKIES_AND_SITE_DATA },
-    { prefs::kResetExtensions, ProfileResetter::EXTENSIONS },
-  };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(name_to_flag); ++i) {
-    if (prefs->GetBoolean(name_to_flag[i].flag_name))
-      reset_mask |= name_to_flag[i].mask;
-  }
-
-  ProfileResetter::ExtensionHandling extension_handling =
-      (prefs->GetInteger(prefs::kResetExtensionsHandling) == 0)
-          ? ProfileResetter::DISABLE_EXTENSIONS
-          : ProfileResetter::UNINSTALL_EXTENSIONS;
-
   resetter_->Reset(
-      reset_mask,
-      extension_handling,
+      ProfileResetter::ALL,
       base::Bind(&ResetProfileSettingsHandler::OnResetProfileSettingsDone,
                  AsWeakPtr()));
 }