| Index: chrome/browser/prefs/command_line_pref_store.cc
|
| ===================================================================
|
| --- chrome/browser/prefs/command_line_pref_store.cc (revision 158895)
|
| +++ chrome/browser/prefs/command_line_pref_store.cc (working copy)
|
| @@ -49,7 +49,7 @@
|
| 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 },
|
|
|
| Property changes on: chrome/browser/prefs/command_line_pref_store.cc
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|