Revert 158894 - Disable TLS channel ID by default. (for merging to branch)

chrome/browser/prefs/command_line_pref_store.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/prefs/command_line_pref_store.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 31 matching lines @@
       { switches::kAlwaysAuthorizePlugins, prefs::kPluginsAlwaysAuthorize,
           true },
       { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false },
       { switches::kNoReferrers, prefs::kEnableReferrers, false },
       { switches::kAllowRunningInsecureContent,
         prefs::kWebKitAllowRunningInsecureContent, true },
       { switches::kNoDisplayingInsecureContent,
         prefs::kWebKitAllowDisplayingInsecureContent, false },
       { switches::kAllowCrossOriginAuthPrompt,
         prefs::kAllowCrossOriginAuthPrompt, true },
-      { switches::kEnableTLSChannelID, prefs::kEnableOriginBoundCerts, true },
+      { switches::kDisableTLSChannelID, prefs::kEnableOriginBoundCerts, false },
       { switches::kDisableSSLFalseStart, prefs::kDisableSSLRecordSplitting,
           true },
       { switches::kEnableMemoryInfo, prefs::kEnableMemoryInfo, true },
 #if defined(GOOGLE_CHROME_BUILD)
       { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true },
 #else
       { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false },
 #endif
 #if defined(OS_CHROMEOS)
       { switches::kDisableGData, prefs::kDisableGData, true },
@@ skipping 107 matching lines @@
   }
 }
 
 void CommandLinePrefStore::ApplyBackgroundModeSwitches() {
   if (command_line_->HasSwitch(switches::kDisableBackgroundMode) ||
       command_line_->HasSwitch(switches::kDisableExtensions)) {
     Value* value = Value::CreateBooleanValue(false);
     SetValue(prefs::kBackgroundModeEnabled, value);
   }
 }