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

net/ssl/channel_id_service.h

 // Copyright 2014 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.
 
 #ifndef NET_SSL_CHANNEL_ID_SERVICE_H_
 #define NET_SSL_CHANNEL_ID_SERVICE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 111 matching lines @@
   //
   // |*out_req| will be initialized with a handle to the async request.
   int GetChannelID(const std::string& host,
                    scoped_ptr<crypto::ECPrivateKey>* key,
                    const CompletionCallback& callback,
                    Request* out_req);
 
   // Returns the backing ChannelIDStore.
   ChannelIDStore* GetChannelIDStore();
 
+  // Returns an ID that is unique across all instances of ChannelIDService in
+  // this process. TODO(nharper): remove this once crbug.com/548423 is resolved.
+  int GetUniqueID() { return id_; }

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

const method

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

Done.

+
   // Public only for unit testing.
   int channel_id_count();
   uint64_t requests() const { return requests_; }
   uint64_t key_store_hits() const { return key_store_hits_; }
   uint64_t inflight_joins() const { return inflight_joins_; }
   uint64_t workers_created() const { return workers_created_; }
 
  private:
   void GotChannelID(int err,
                     const std::string& server_identifier,
@@ skipping 22 matching lines @@
   // failure (including failure to find a channel ID of |domain|).
   int LookupChannelID(const base::TimeTicks& request_start,
                       const std::string& domain,
                       scoped_ptr<crypto::ECPrivateKey>* key,
                       bool create_if_missing,
                       const CompletionCallback& callback,
                       Request* out_req);
 
   scoped_ptr<ChannelIDStore> channel_id_store_;
   scoped_refptr<base::TaskRunner> task_runner_;
+  int id_;

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

can this be const?

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

Yes. Done.

 
   // inflight_ maps from a server to an active generation which is taking
   // place.
   std::map<std::string, ChannelIDServiceJob*> inflight_;
 
   uint64_t requests_;
   uint64_t key_store_hits_;
   uint64_t inflight_joins_;
   uint64_t workers_created_;
 
   base::WeakPtrFactory<ChannelIDService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelIDService);
 };
 
 }  // namespace net
 
 #endif  // NET_SSL_CHANNEL_ID_SERVICE_H_