Chromeos: Remove CaptivePortalBypassProxy user option.

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

Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 7bba6f8e9ba5d17a2b7a84a12964ede1a23261d2..7138e40ae2183fec1470e50975154eaebc79bd52 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -495,10 +495,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
     { "cloudPrintEnableNotificationsLabel",
       IDS_LOCAL_DISCOVERY_NOTIFICATIONS_ENABLE_CHECKBOX_LABEL },
 #endif  // defined(ENABLE_SERVICE_DISCOVERY)
-#if defined(OS_CHROMEOS)
-    { "captivePortalBypassProxy",
-      IDS_OPTIONS_CAPTIVE_PORTAL_BYPASS_PROXY_LABEL },
-#endif
   };
 
 #if defined(ENABLE_SETTINGS_APP)
@@ -662,11 +658,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
 
   RegisterTitle(values, "thirdPartyImeConfirmOverlay",
                 IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_TITLE);
-
-  values->SetBoolean(
-      "enableCaptivePortalBypassProxyOption",
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kEnableCaptivePortalBypassProxyOption));
 #endif
 
   values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser());