| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index 25d90101dd1755e453bfd0e842fa29fe53ba5ea8..a0a20c734184a4f4532deb4ae635bfba511ebc1c 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -1402,20 +1402,8 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
| browser_process_->intranet_redirect_detector();
|
| GoogleSearchCounter::RegisterForNotifications();
|
|
|
| - if (parsed_command_line().HasSwitch(switches::kEnableSdch)) {
|
| - // SDCH options via switches::kEnableSdch include:
|
| - const int kSdchDisabled = 0;
|
| - const int kSdchOverHttpEnabled = 1;
|
| - const int kSdchOverBothHttpAndHttpsEnabled = 2;
|
| - int sdch_enabled = kSdchOverHttpEnabled;
|
| - if (base::StringToInt(parsed_command_line().GetSwitchValueASCII(
|
| - switches::kEnableSdch), &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::kEnableSdchOverHttps)) {
|
| + net::SdchManager::EnableSecureSchemeSupport(true);
|
| }
|
|
|
| if (parsed_command_line().HasSwitch(switches::kEnableWatchdog))
|
|
|