Combine ChannelIDService::RequestHandle and ChannelIDServiceRequest classes

chrome/browser/extensions/api/messaging/message_property_provider.cc

 // Copyright 2013 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 "chrome/browser/extensions/api/messaging/message_property_provider.h"
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 30 matching lines @@
                  request_context_getter,
                  source_url.host(),
                  reply));
 }
 
 // Helper struct to bind the memory addresses that will be written to by
 // ChannelIDService::GetChannelID to the callback provided to
 // MessagePropertyProvider::GetChannelID.
 struct MessagePropertyProvider::GetChannelIDOutput {
   scoped_ptr<crypto::ECPrivateKey> channel_id_key;
-  net::ChannelIDService::RequestHandle request_handle;
+  net::ChannelIDService::Request request;
 };
 
 // static
 void MessagePropertyProvider::GetChannelIDOnIOThread(
     scoped_refptr<base::TaskRunner> original_task_runner,
     scoped_refptr<net::URLRequestContextGetter> request_context_getter,
     const std::string& host,
     const ChannelIDCallback& reply) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   net::ChannelIDService* channel_id_service =
       request_context_getter->GetURLRequestContext()->
           channel_id_service();
   GetChannelIDOutput* output = new GetChannelIDOutput();
   net::CompletionCallback net_completion_callback =
       base::Bind(&MessagePropertyProvider::GotChannelID,
                  original_task_runner,
                  base::Owned(output),
                  reply);
-  int status = channel_id_service->GetChannelID(host, &output->channel_id_key,
-                                                net_completion_callback,
-                                                &output->request_handle);
+  int status = channel_id_service->GetChannelID(
+      host, &output->channel_id_key, net_completion_callback, &output->request);
   if (status == net::ERR_IO_PENDING)
     return;
   GotChannelID(original_task_runner, output, reply, status);
 }
 
 // static
 void MessagePropertyProvider::GotChannelID(
     scoped_refptr<base::TaskRunner> original_task_runner,
     struct GetChannelIDOutput* output,
     const ChannelIDCallback& reply,
@@ skipping 14 matching lines @@
   if (!net::JwkSerializer::ConvertSpkiFromDerToJwk(spki, &jwk_value)) {
     original_task_runner->PostTask(FROM_HERE, no_tls_channel_id_closure);
     return;
   }
   std::string jwk_str;
   base::JSONWriter::Write(jwk_value, &jwk_str);
   original_task_runner->PostTask(FROM_HERE, base::Bind(reply, jwk_str));
 }
 
 }  // namespace extensions