Enable SDCH support 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"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 1372 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();
 
-  // Disable SDCH filtering if switches::kEnableSdch is 0.
-  int sdch_enabled = 1;
+  // SDCH options via switches::kEnableSdch include:

[Lei Zhang, 2014/01/08 19:42:23]

nit: you can declare these inside the if() block below since there are only used
in there.

[jar (doing other things), 2014/01/08 23:46:18]

+1

[mef, 2014/01/09 16:23:53]

Done.

+  const int kSdchDisabled = 0;
+  const int kSdchOverHttpEnabled = 1;
+  const int kSdchOverBothHttpAndHttpsEnabled = 2;
+  int sdch_enabled = kSdchOverHttpEnabled;
   if (parsed_command_line().HasSwitch(switches::kEnableSdch)) {
     base::StringToInt(parsed_command_line().GetSwitchValueASCII(

[Lei Zhang, 2014/01/08 19:42:23]

If you care about 'imperfect conversions' as defined in
base/strings/string_number_conversions.h for StringToInt(), then you'd want to
check the return value.

[mef, 2014/01/09 16:23:53]

Done.

         switches::kEnableSdch), &sdch_enabled);
-    if (!sdch_enabled)
+    if (sdch_enabled == kSdchDisabled) {
       net::SdchManager::EnableSdchSupport(false);
+    } else if (sdch_enabled == kSdchOverBothHttpAndHttpsEnabled) {
+      net::SdchManager::EnableSecureSchemeSupport(true);
+    }
   }
 
   if (parsed_command_line().HasSwitch(switches::kEnableWatchdog))
     InstallJankometer(parsed_command_line());
 
 #if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD)
   if (parsed_command_line().HasSwitch(switches::kDebugPrint)) {
     base::FilePath path =
         parsed_command_line().GetSwitchValuePath(switches::kDebugPrint);
     printing::PrintedDocument::set_debug_dump_path(path);
@@ skipping 281 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif
 #endif
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }