Revert r74860 as it broke arm:

chrome/browser/dom_ui/options/advanced_options_handler.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/dom_ui/options/advanced_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 39 matching lines @@
 #endif
 
 AdvancedOptionsHandler::AdvancedOptionsHandler() {
 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
   cloud_print_proxy_ui_enabled_ = true;
 #elif !defined(OS_CHROMEOS)
   cloud_print_proxy_ui_enabled_ =
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableCloudPrintProxy);
 #endif
-  cloud_print_proxy_ui_enabled_ = true;
 }
 
 AdvancedOptionsHandler::~AdvancedOptionsHandler() {
 }
 
 void AdvancedOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
-  static OptionsStringResource resources[] = {
+  OptionsStringResource resources[] = {
     { "downloadLocationGroupName",
       IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME },
     { "downloadLocationChangeButton",
       IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON },
     { "downloadLocationBrowseTitle",
       IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE },
     { "downloadLocationBrowseWindowTitle",
       IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_WINDOW_TITLE },
     { "downloadLocationAskForSaveLocation",
       IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION },
@@ skipping 47 matching lines @@
       IDS_OPTIONS_FONT_SIZE_LABEL_MEDIUM },
     { "fontSizeLabelLarge",
       IDS_OPTIONS_FONT_SIZE_LABEL_LARGE },
     { "fontSizeLabelVeryLarge",
       IDS_OPTIONS_FONT_SIZE_LABEL_VERY_LARGE },
     { "fontSizeLabelCustom",
       IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM },
     { "fontSettingsCustomizeFontsButton",
       IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON },
     { "languageAndSpellCheckSettingsButton",
-      IDS_OPTIONS_LANGUAGE_AND_SPELLCHECK_BUTTON },
+      IDS_OPTIONS_LANGUAGE_AND_SPELLCHECK_BUTTON, true },
     { "advancedSectionTitlePrivacy",
-      IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY },
+      IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY, true },
     { "advancedSectionTitleContent",
-      IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT },
+      IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT, true },
     { "advancedSectionTitleSecurity",
-      IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY },
+      IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY, true },
     { "advancedSectionTitleNetwork",
-      IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK },
+      IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK, true },
     { "advancedSectionTitleTranslate",
-      IDS_OPTIONS_ADVANCED_SECTION_TITLE_TRANSLATE },
+      IDS_OPTIONS_ADVANCED_SECTION_TITLE_TRANSLATE, true },
     { "translateEnableTranslate",
       IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
     { "enableLogging",
       IDS_OPTIONS_ENABLE_LOGGING },
     { "improveBrowsingExperience",
       IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE },
     { "disableWebServices",
       IDS_OPTIONS_DISABLE_WEB_SERVICES },
 #if !defined(OS_CHROMEOS)
     { "advancedSectionTitleCloudPrint",
@@ skipping 22 matching lines @@
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "advancedPage",
                 IDS_OPTIONS_ADVANCED_TAB_LABEL);
 
   localized_strings->SetString("privacyLearnMoreURL",
       google_util::AppendGoogleLocaleParam(
           GURL(chrome::kPrivacyLearnMoreURL)).spec());
 #if !defined(OS_CHROMEOS)
   // Add the cloud print proxy management ui section if it's been runtime
   // enabled.
-  localized_strings->SetBoolean("enable-cloud-print-proxy",
-                                cloud_print_proxy_ui_enabled_);
+  localized_strings->SetString(
+      "enable-cloud-print-proxy",
+      cloud_print_proxy_ui_enabled_ ? "true" : "false" );
 #endif
 }
 
 void AdvancedOptionsHandler::Initialize() {
   DCHECK(web_ui_);
   SetupMetricsReportingCheckbox();
   SetupMetricsReportingSettingVisibility();
   SetupFontSizeLabel();
   SetupDownloadLocationPath();
   SetupAutoOpenFileTypesDisabledAttribute();
@@ skipping 166 matching lines @@
   UserMetricsRecordAction(UserMetricsAction("Options_ResetAutoOpenFiles"));
   DownloadManager* manager = web_ui_->GetProfile()->GetDownloadManager();
   if (manager)
     manager->download_prefs()->ResetAutoOpen();
 }
 
 void AdvancedOptionsHandler::HandleMetricsReportingCheckbox(
     const ListValue* args) {
 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)
   std::string checked_str = WideToUTF8(ExtractStringValue(args));
-  bool enabled = checked_str == "true";
+  bool enabled = (checked_str == "true");
   UserMetricsRecordAction(
       enabled ?
           UserMetricsAction("Options_MetricsReportingCheckbox_Enable") :
           UserMetricsAction("Options_MetricsReportingCheckbox_Disable"));
   bool is_enabled = OptionsUtil::ResolveMetricsReportingEnabled(enabled);
   enable_metrics_recording_.SetValue(is_enabled);
   SetupMetricsReportingCheckbox();
 #endif
 }
 
 void AdvancedOptionsHandler::HandleDefaultFontSize(const ListValue* args) {
   int font_size;
   if (ExtractIntegerValue(args, &font_size)) {
     if (font_size > 0) {
       default_font_size_.SetValue(font_size);
       default_fixed_font_size_.SetValue(font_size);
       SetupFontSizeLabel();
     }
   }
 }
 
 #if defined(OS_WIN)
 void AdvancedOptionsHandler::HandleCheckRevocationCheckbox(
     const ListValue* args) {
   std::string checked_str = WideToUTF8(ExtractStringValue(args));
-  bool enabled = checked_str == "true";
+  bool enabled = (checked_str == "true");
   std::string metric =
       (enabled ? "Options_CheckCertRevocation_Enable"
                : "Options_CheckCertRevocation_Disable");
   UserMetricsRecordAction(UserMetricsAction(metric.c_str()));
   net::SSLConfigServiceWin::SetRevCheckingEnabled(enabled);
 }
 
 void AdvancedOptionsHandler::HandleUseSSL3Checkbox(const ListValue* args) {
   std::string checked_str = WideToUTF8(ExtractStringValue(args));
-  bool enabled = checked_str == "true";
+  bool enabled = (checked_str == "true");
   std::string metric =
       (enabled ? "Options_SSL3_Enable" : "Options_SSL3_Disable");
   UserMetricsRecordAction(UserMetricsAction(metric.c_str()));
   net::SSLConfigServiceWin::SetSSL3Enabled(enabled);
 }
 
 void AdvancedOptionsHandler::HandleUseTLS1Checkbox(const ListValue* args) {
   std::string checked_str = WideToUTF8(ExtractStringValue(args));
-  bool enabled = checked_str == "true";
+  bool enabled = (checked_str == "true");
   std::string metric =
       (enabled ? "Options_TLS1_Enable" : "Options_TLS1_Disable");
   UserMetricsRecordAction(UserMetricsAction(metric.c_str()));
   net::SSLConfigServiceWin::SetTLS1Enabled(enabled);
 }
 
 void AdvancedOptionsHandler::HandleShowGearsSettings(const ListValue* args) {
   UserMetricsRecordAction(UserMetricsAction("Options_GearsSettings"));
   GearsSettingsPressed(
       web_ui_->tab_contents()->view()->GetTopLevelNativeWindow());
@@ skipping 201 matching lines @@
   FundamentalValue useSSL3Value(useSSL3Setting);
   web_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetUseSSL3CheckboxState",
       useSSL3Value, disabledValue);
   FundamentalValue useTLS1Value(useTLS1Setting);
   web_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetUseTLS1CheckboxState",
       useTLS1Value, disabledValue);
 }
 #endif