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.
-    const char kSdchFieldTrialName[] = "SDCH";
-    const char kEnabledAllGroupName[] = "EnabledAll";
-    const char kEnabledHttpOnlyGroupName[] = "EnabledHttpOnly";
-    const char kDisabledAllGroupName[] = "DisabledAll";
+  // Check SDCH field trial.  Default is now that everything is enabled,
+  // so provide options for disabling HTTPS or all of SDCH.
+  const char kSdchFieldTrialName[] = "SDCH";
+  const char kEnabledHttpOnlyGroupName[] = "EnabledHttpOnly";
+  const char kDisabledAllGroupName[] = "DisabledAll";
 
-    // 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)) {
-      net::SdchManager::EnableSecureSchemeSupport(true);
-      net::SdchManager::EnableSdchSupport(true);
-    } else if (sdch_trial_group.starts_with(kEnabledHttpOnlyGroupName)) {
-      net::SdchManager::EnableSdchSupport(true);
-    } else if (sdch_trial_group.starts_with(kDisabledAllGroupName)) {
-      net::SdchManager::EnableSdchSupport(false);
-    }
+  // 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(kEnabledHttpOnlyGroupName)) {
+    net::SdchManager::EnableSdchSupport(true);
+    net::SdchManager::EnableSecureSchemeSupport(false);
+  } else if (sdch_trial_group.starts_with(kDisabledAllGroupName)) {
+    net::SdchManager::EnableSdchSupport(false);
   }
 
 #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 271 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif
 #endif
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }