Enable SDCH over HTTPS.

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2012 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/chrome_browser_main.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 1356 matching lines @@
   //
   // A simpler way of doing all this would be to have some function which could
   // give the time elapsed since startup, and simply have this object check that
   // when asked to initialize itself, but this doesn't seem to exist.
   //
   // This can't be created in the BrowserProcessImpl constructor because it
   // needs to read prefs that get set after that runs.
   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.
     std::string sdch_trial_group_string =
         base::FieldTrialList::FindFullName(kSdchFieldTrialName);
     base::StringPiece sdch_trial_group(sdch_trial_group_string);
     if (sdch_trial_group.starts_with(kEnabledAllGroupName)) {

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

Is kEnabledAllGroupName still needed? 

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

Done.

       net::SdchManager::EnableSecureSchemeSupport(true);
       net::SdchManager::EnableSdchSupport(true);
     } else if (sdch_trial_group.starts_with(kEnabledHttpOnlyGroupName)) {

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

This is essentially "kDisabledHttps", right? Then it should have
EnableSecureSchemeSupport(false);

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

Yeah, you're right.  That's probably the right way to go, and not add a new
group name.  Done.

       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);
     }
   }
 
 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD)
   if (parsed_command_line().HasSwitch(switches::kDebugPrint)) {
     base::FilePath path =
         parsed_command_line().GetSwitchValuePath(switches::kDebugPrint);
     printing::PrintedDocument::set_debug_dump_path(path);
   }
 #endif
@@ skipping 272 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif
 #endif
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }