Disable TLS channel id if cookies are disabled or third-party cookies are blocked.

chrome/browser/net/ssl_config_service_manager.h

Index: chrome/browser/net/ssl_config_service_manager.h
diff --git a/chrome/browser/net/ssl_config_service_manager.h b/chrome/browser/net/ssl_config_service_manager.h
index f3b30523ded2d64648d0564de1b6f019afff3586..b5c7b2b5bb719f4233dcee140c7f189e9e4d19b6 100644
--- a/chrome/browser/net/ssl_config_service_manager.h
+++ b/chrome/browser/net/ssl_config_service_manager.h
@@ -16,11 +16,13 @@ class SSLConfigServiceManager {
  public:
   // Create an instance of the SSLConfigServiceManager. The lifetime of the
   // PrefService objects must be longer than that of the manager. Get SSL
-  // preferences from local_state object.
+  // preferences from local_state object.  The user_prefs may be NULL if this
+  // SSLConfigServiceManager is not associated with a profile.
   static SSLConfigServiceManager* CreateDefaultManager(
-      PrefService* local_state);
+      PrefService* local_state,
+      PrefService* user_prefs);
 
-  static void RegisterPrefs(PrefService* prefs);
+  static void RegisterPrefs(PrefService* local_state);
 
   virtual ~SSLConfigServiceManager() {}