Combine ChannelIDService::RequestHandle and ChannelIDServiceRequest classes

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 <map>
 #include <string>
 #include <vector>
@@ skipping 11 matching lines @@
 class TaskRunner;
 }  // namespace base
 
 namespace crypto {
 class ECPrivateKey;
 }  // namespace crypto
 
 namespace net {
 
 class ChannelIDServiceJob;
-class ChannelIDServiceRequest;
 class ChannelIDServiceWorker;
 
 // A class for creating and fetching Channel IDs.
 
 // Inherits from NonThreadSafe in order to use the function
 // |CalledOnValidThread|.
 class NET_EXPORT ChannelIDService
     : NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
-  class NET_EXPORT RequestHandle {
+  class NET_EXPORT Request {
    public:
-    RequestHandle();
-    ~RequestHandle();
+    Request();
+    ~Request();
 
     // Cancel the request.  Does nothing if the request finished or was already
     // cancelled.
     void Cancel();
 
-    bool is_active() const { return request_ != NULL; }
+    bool is_active() const { return !callback_.is_null(); }
 
    private:
     friend class ChannelIDService;
+    friend class ChannelIDServiceJob;
 
     void RequestStarted(ChannelIDService* service,
-                        ChannelIDServiceRequest* request,
-                        const CompletionCallback& callback);
+                        base::TimeTicks request_start,
+                        const CompletionCallback& callback,
+                        scoped_ptr<crypto::ECPrivateKey>* key);
 
-    void OnRequestComplete(int result);
+    void Post(int error, scoped_ptr<crypto::ECPrivateKey> key);
 
     ChannelIDService* service_;
-    ChannelIDServiceRequest* request_;
+    base::TimeTicks request_start_;
     CompletionCallback callback_;
+    scoped_ptr<crypto::ECPrivateKey>* key_;
   };
 
   // Password used on EncryptedPrivateKeyInfo data stored in EC private_key
   // values.  (This is not used to provide any security, but to workaround NSS
   // being unable to import unencrypted PrivateKeyInfo for EC keys.)
   static const char kEPKIPassword[];
 
   // This object owns |channel_id_store|.  |task_runner| will
   // be used to post channel ID generation worker tasks.  The tasks are
   // safe for use with WorkerPool and SequencedWorkerPool::CONTINUE_ON_SHUTDOWN.
@@ skipping 12 matching lines @@
   // creates one otherwise. Returns OK if successful or an error code upon
   // failure.
   //
   // On successful completion, |key| holds the ECDSA keypair used for this
   // channel ID.
   //
   // |callback| must not be null. ERR_IO_PENDING is returned if the operation
   // could not be completed immediately, in which case the result code will
   // be passed to the callback when available.
   //
-  // |*out_req| will be initialized with a handle to the async request. This
-  // RequestHandle object must be cancelled or destroyed before the
-  // ChannelIDService is destroyed.
+  // |*out_req| will be initialized with a handle to the async request.
   int GetOrCreateChannelID(const std::string& host,
                            scoped_ptr<crypto::ECPrivateKey>* key,
                            const CompletionCallback& callback,
-                           RequestHandle* out_req);
+                           Request* out_req);
 
   // Fetches the channel ID for the specified host if one exists.
   // Returns OK if successful, ERR_FILE_NOT_FOUND if none exists, or an error
   // code upon failure.
   //
   // On successful completion, |key| holds the ECDSA keypair used for this
   // channel ID.
   //
   // |callback| must not be null. ERR_IO_PENDING is returned if the operation
   // could not be completed immediately, in which case the result code will
   // be passed to the callback when available. If an in-flight
   // GetChannelID is pending, and a new GetOrCreateChannelID
   // request arrives for the same domain, the GetChannelID request will
   // not complete until a new channel ID is created.
   //
-  // |*out_req| will be initialized with a handle to the async request. This
-  // RequestHandle object must be cancelled or destroyed before the
-  // ChannelIDService is destroyed.
+  // |*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,
-                   RequestHandle* out_req);
+                   Request* out_req);
 
   // Returns the backing ChannelIDStore.
   ChannelIDStore* GetChannelIDStore();
 
   // Public only for unit testing.
   int channel_id_count();
   uint64 requests() const { return requests_; }
   uint64 key_store_hits() const { return key_store_hits_; }
   uint64 inflight_joins() const { return inflight_joins_; }
   uint64 workers_created() const { return workers_created_; }
 
  private:
   // Cancels the specified request. |req| is the handle stored by
   // GetChannelID(). After a request is canceled, its completion
   // callback will not be called.
-  void CancelRequest(ChannelIDServiceRequest* req);
+  void CancelRequest(Request* req);
 
   void GotChannelID(int err,
                     const std::string& server_identifier,
                     scoped_ptr<crypto::ECPrivateKey> key);
   void GeneratedChannelID(
       const std::string& server_identifier,
       int error,
       scoped_ptr<ChannelIDStore::ChannelID> channel_id);
   void HandleResult(int error,
                     const std::string& server_identifier,
                     scoped_ptr<crypto::ECPrivateKey> key);
 
   // Searches for an in-flight request for the same domain. If found,
   // attaches to the request and returns true. Returns false if no in-flight
   // request is found.
   bool JoinToInFlightRequest(const base::TimeTicks& request_start,
                              const std::string& domain,
                              scoped_ptr<crypto::ECPrivateKey>* key,
                              bool create_if_missing,
                              const CompletionCallback& callback,
-                             RequestHandle* out_req);
+                             Request* out_req);
 
   // Looks for the channel ID for |domain| in this service's store.
   // Returns OK if it can be found synchronously, ERR_IO_PENDING if the
   // result cannot be obtained synchronously, or a network error code on
   // 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,
-                      RequestHandle* out_req);
+                      Request* out_req);
 
   scoped_ptr<ChannelIDStore> channel_id_store_;
   scoped_refptr<base::TaskRunner> task_runner_;
 
   // inflight_ maps from a server to an active generation which is taking
   // place.
   std::map<std::string, ChannelIDServiceJob*> inflight_;
 
   uint64 requests_;
   uint64 key_store_hits_;
   uint64 inflight_joins_;
   uint64 workers_created_;
 
   base::WeakPtrFactory<ChannelIDService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelIDService);
 };
 
 }  // namespace net
 
 #endif  // NET_SSL_CHANNEL_ID_SERVICE_H_