Keep track of ChannelIDService in CookieStore

net/url_request/url_request_http_job.cc

Index: net/url_request/url_request_http_job.cc
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index ccc38d544ead9009417fdda7e4b7595c53defc7e..50e403b7c7b97c8dcc16b069b1aac828423ca923 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -82,6 +82,8 @@ void LogChannelIDAndCookieStores(const net::URLRequestContext* context,
     EPHEMERAL_MISMATCH = 8,
     PERSISTENT_MATCH = 9,
     PERSISTENT_MISMATCH = 10,
+    EPHEMERAL_UNKNOWN = 11,
+    PERSISTENT_UNKNOWN = 12,
     EPHEMERALITY_MAX
   } ephemerality;
   const net::HttpNetworkSession::Params* params =
@@ -93,9 +95,11 @@ void LogChannelIDAndCookieStores(const net::URLRequestContext* context,
     ephemerality = NO_COOKIE_STORE;
   } else if (params->channel_id_service->GetChannelIDStore()->IsEphemeral()) {
     if (cookie_store->IsEphemeral()) {
-      if (context->channel_id_service() &&
-          params->channel_id_service->GetUniqueID() ==
-              context->channel_id_service()->GetUniqueID()) {
+      if (cookie_store->GetChannelIDServiceID() == -1) {
+        ephemerality = EPHEMERAL_UNKNOWN;
+      } else if (context->channel_id_service() &&
+                 cookie_store->GetChannelIDServiceID() ==
+                     context->channel_id_service()->GetUniqueID()) {

[mmenke, 2016/03/18 21:50:45]

While I'm not familiar with just how channel ID is hooked up, this whole thing
seems very prone to bugs.  Safebrowsing, for instance, does wire up its own
ChannelIDService and CookieStore.  But since it shares an HttpNetworkSession
with the main profile, it's still presumably borked, and this code wouldn't
catch it, since the URLRequestContext's CookieStore and ChannelIDService match,
it's just the HttpNetworkSession's ChannelIDService that's wrong.

[nharper, 2016/03/18 21:59:03]

Safe browsing wires up its own CookieStore, but doesn't touch the
ChannelIDService (Ignoring my other CL). However, you correctly point out that I
meant to replace the context->channel_id_service()->GetUniqueID() line, not the
params->channel_id_service->GetUniqueID().

I.e. I should be checking that the id in the cookie store matches the one in the
HttpNetworkSession::Params's channel_id_service, since I want to be comparing
against the ChannelIDService actually in use.

         ephemerality = EPHEMERAL_MATCH;
       } else {
         ephemerality = EPHEMERAL_MISMATCH;
@@ -107,8 +111,10 @@ void LogChannelIDAndCookieStores(const net::URLRequestContext* context,
     }
   } else if (cookie_store->IsEphemeral()) {
     ephemerality = CID_PERSISTENT_COOKIE_EPHEMERAL;
+  } else if (cookie_store->GetChannelIDServiceID() == -1) {
+    ephemerality = PERSISTENT_UNKNOWN;
   } else if (context->channel_id_service() &&
-             params->channel_id_service->GetUniqueID() ==
+             cookie_store->GetChannelIDServiceID() ==
                  context->channel_id_service()->GetUniqueID()) {
     ephemerality = PERSISTENT_MATCH;
   } else {