Enable SDCH over HTTPS.

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 2a261b94cbc99772ec463610a7e438e1ec141b4e..e63a63b9cc46c534f2f23778eb14b10e9191f100 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1374,14 +1374,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   browser_process_->intranet_redirect_detector();
   GoogleSearchCounter::RegisterForNotifications();
 
-  if (parsed_command_line().HasSwitch(switches::kEnableSdchOverHttps)) {
-    net::SdchManager::EnableSecureSchemeSupport(true);
-  } else {
-    // Check SDCH field trial.
+  {

[mef, 2014/09/23 08:06:32]

is empty block needed here? I don't see them elsewhere in this file,

[Randy Smith (Not in Mondays), 2014/09/23 21:44:43]

Done.

+    // Check SDCH field trial, primary to allow disabling of HTTPS
+    // if necessary, now that it's enabled by default.
     const char kSdchFieldTrialName[] = "SDCH";
     const char kEnabledAllGroupName[] = "EnabledAll";
     const char kEnabledHttpOnlyGroupName[] = "EnabledHttpOnly";
     const char kDisabledAllGroupName[] = "DisabledAll";
+    const char kDisabledHttps[] = "DisabledHttps";
 
     // Store in a string on return to keep underlying storage for
     // StringPiece stable.
@@ -1395,6 +1395,9 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
       net::SdchManager::EnableSdchSupport(true);
     } else if (sdch_trial_group.starts_with(kDisabledAllGroupName)) {
       net::SdchManager::EnableSdchSupport(false);
+    } else if (sdch_trial_group.starts_with(kDisabledHttps)) {
+      net::SdchManager::EnableSecureSchemeSupport(false);
+      net::SdchManager::EnableSdchSupport(true);
     }
   }