Combine ChannelIDService::RequestHandle and ChannelIDServiceRequest classes

net/quic/crypto/channel_id_chromium.cc

 // 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.
 
 #include "net/quic/crypto/channel_id_chromium.h"
 
 #include <string>
 
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
@@ skipping 71 matching lines @@
   void OnIOComplete(int result);
   int DoGetChannelIDKey(int result);
   int DoGetChannelIDKeyComplete(int result);
 
   // Channel ID source to notify when this jobs completes.
   ChannelIDSourceChromium* const channel_id_source_;
 
   ChannelIDService* const channel_id_service_;
 
   scoped_ptr<crypto::ECPrivateKey> channel_id_crypto_key_;
-  ChannelIDService::RequestHandle channel_id_request_handle_;
+  ChannelIDService::Request channel_id_request_;
 
   // |hostname| specifies the hostname for which we need a channel ID.
   std::string hostname_;
 
   scoped_ptr<ChannelIDSourceCallback> callback_;
 
   scoped_ptr<ChannelIDKey> channel_id_key_;
 
   State next_state_;
 
@@ skipping 71 matching lines @@
   }
 }
 
 int ChannelIDSourceChromium::Job::DoGetChannelIDKey(int result) {
   next_state_ = STATE_GET_CHANNEL_ID_KEY_COMPLETE;
 
   return channel_id_service_->GetOrCreateChannelID(
       hostname_, &channel_id_crypto_key_,
       base::Bind(&ChannelIDSourceChromium::Job::OnIOComplete,
                  base::Unretained(this)),
-      &channel_id_request_handle_);
+      &channel_id_request_);
 }
 
 int ChannelIDSourceChromium::Job::DoGetChannelIDKeyComplete(int result) {
   DCHECK_EQ(STATE_NONE, next_state_);
   if (result != OK) {
     DLOG(WARNING) << "Failed to look up channel ID: " << ErrorToString(result);
     return result;
   }
 
   if (!channel_id_crypto_key_) {
@@ skipping 28 matching lines @@
   }
   return status;
 }
 
 void ChannelIDSourceChromium::OnJobComplete(Job* job) {
   active_jobs_.erase(job);
   delete job;
 }
 
 }  // namespace net