Add atomic sequence number to ChannelIDService and check that in URLRequestHttpJob logging

net/url_request/url_request_http_job.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 "net/url_request/url_request_http_job.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 56 matching lines @@
 
 void LogChannelIDAndCookieStores(const net::URLRequestContext* context,
                                  const net::SSLInfo& ssl_info) {
   if (!ssl_info.channel_id_sent)
     return;
   // This enum is used for an UMA histogram - don't reuse or renumber entries.
   enum {
     CID_EPHEMERAL_COOKIE_EPHEMERAL = 0,
     CID_EPHEMERAL_COOKIE_PERSISTENT = 1,
     CID_PERSISTENT_COOKIE_EPHEMERAL = 2,
     CID_PERSISTENT_COOKIE_PERSISTENT = 3,

[mattm, 2016/03/09 21:33:01]

Comment out which of these are no longer used

[nharper, 2016/03/09 21:52:07]

Done.

     NO_COOKIE_STORE = 4,
     NO_CHANNEL_ID_STORE = 5,
     KNOWN_MISMATCH = 6,
+    EPHEMERAL_MATCH = 7,
+    EPHEMERAL_MISMATCH = 8,
+    PERSISTENT_MATCH = 9,
+    PERSISTENT_MISMATCH = 10,
     EPHEMERALITY_MAX
   } ephemerality;
   const net::HttpNetworkSession::Params* params =
       context->GetNetworkSessionParams();
   net::CookieStore* cookie_store = context->cookie_store();
   if (params == nullptr || params->channel_id_service == nullptr) {
     ephemerality = NO_CHANNEL_ID_STORE;
   } else if (cookie_store == nullptr) {
     ephemerality = NO_COOKIE_STORE;
   } else if (params->channel_id_service->GetChannelIDStore()->IsEphemeral()) {
     if (cookie_store->IsEphemeral()) {
-      ephemerality = CID_EPHEMERAL_COOKIE_EPHEMERAL;
+      if (context->channel_id_service() &&
+          params->channel_id_service->GetUniqueID() ==
+              context->channel_id_service()->GetUniqueID()) {
+        ephemerality = EPHEMERAL_MATCH;
+      } else {
+        ephemerality = EPHEMERAL_MISMATCH;
+      }
     } else if (context->has_known_mismatched_cookie_store()) {
       ephemerality = KNOWN_MISMATCH;
     } else {
       ephemerality = CID_EPHEMERAL_COOKIE_PERSISTENT;
     }
-  } else if (cookie_store->IsEphemeral()) {
-    ephemerality = CID_PERSISTENT_COOKIE_EPHEMERAL;
+  } else if (!cookie_store->IsEphemeral()) {
+    ephemerality = CID_PERSISTENT_COOKIE_PERSISTENT;

[mattm, 2016/03/09 21:33:01]

this looks wrong..

Above,CID_EPHEMERAL_COOKIE_EPHEMERAL is no longer used since it was replaced
with EPHEMERAL_MATCH and EPHEMERAL_MISMATCH. That makes sense.
 
Here CID_PERSISTENT_COOKIE_PERSISTENT is still used, and it looks like the
PERSISTENT_MATCH / PERSISTENT_MISMATCH condition replaces
CID_PERSISTENT_COOKIE_EPHEMERAL? Why is that?

[nharper, 2016/03/09 21:52:07]

I goofed when making this half of the change. Your expectation of what it should
be is what it should be.

+  } else if (context->channel_id_service() &&
+             params->channel_id_service->GetUniqueID() ==
+                 context->channel_id_service()->GetUniqueID()) {
+    ephemerality = PERSISTENT_MATCH;
   } else {
-    ephemerality = CID_PERSISTENT_COOKIE_PERSISTENT;
+    ephemerality = PERSISTENT_MISMATCH;
   }
   UMA_HISTOGRAM_ENUMERATION("Net.TokenBinding.StoreEphemerality", ephemerality,
                             EPHEMERALITY_MAX);
 }
 
 }  // namespace
 
 namespace net {
 
 class URLRequestHttpJob::HttpFilterContext : public FilterContext {
@@ skipping 1452 matching lines @@
   return override_response_headers_.get() ?
              override_response_headers_.get() :
              transaction_->GetResponseInfo()->headers.get();
 }
 
 void URLRequestHttpJob::NotifyURLRequestDestroyed() {
   awaiting_callback_ = false;
 }
 
 }  // namespace net