Combine ChannelIDService::RequestHandle and ChannelIDServiceRequest classes

chrome/browser/extensions/extension_messages_apitest.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 "base/base64.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 956 matching lines @@
   public ExternallyConnectableMessagingTest {
  public:
   ExternallyConnectableMessagingWithTlsChannelIdTest()
       : tls_channel_id_created_(false, false) {
   }
 
   std::string CreateTlsChannelId() {
     scoped_refptr<net::URLRequestContextGetter> request_context_getter(
         profile()->GetRequestContext());
     scoped_ptr<crypto::ECPrivateKey> channel_id_key;
-    net::ChannelIDService::RequestHandle request_handle;
+    net::ChannelIDService::Request request;
     content::BrowserThread::PostTask(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&ExternallyConnectableMessagingWithTlsChannelIdTest::
                        CreateDomainBoundCertOnIOThread,
                    base::Unretained(this), base::Unretained(&channel_id_key),
-                   base::Unretained(&request_handle), request_context_getter));
+                   base::Unretained(&request), request_context_getter));
     tls_channel_id_created_.Wait();
     // Create the expected value.
     std::vector<uint8> spki_vector;
     if (!channel_id_key->ExportPublicKey(&spki_vector))
       return std::string();
     base::StringPiece spki(reinterpret_cast<char*>(
         vector_as_array(&spki_vector)), spki_vector.size());
     base::DictionaryValue jwk_value;
     net::JwkSerializer::ConvertSpkiFromDerToJwk(spki, &jwk_value);
     std::string tls_channel_id_value;
     base::JSONWriter::Write(jwk_value, &tls_channel_id_value);
     return tls_channel_id_value;
   }
 
  private:
   void CreateDomainBoundCertOnIOThread(
       scoped_ptr<crypto::ECPrivateKey>* channel_id_key,
-      net::ChannelIDService::RequestHandle* request_handle,
+      net::ChannelIDService::Request* request,
       scoped_refptr<net::URLRequestContextGetter> request_context_getter) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     net::ChannelIDService* channel_id_service =
         request_context_getter->GetURLRequestContext()->
             channel_id_service();
     int status = channel_id_service->GetOrCreateChannelID(
         chromium_org_url().host(), channel_id_key,
         base::Bind(&ExternallyConnectableMessagingWithTlsChannelIdTest::
                        GotDomainBoundCert,
                    base::Unretained(this)),
-        request_handle);
+        request);
     if (status == net::ERR_IO_PENDING)
       return;
     GotDomainBoundCert(status);
   }
 
   void GotDomainBoundCert(int status) {
     ASSERT_TRUE(status == net::OK);
     tls_channel_id_created_.Signal();
   }
 
@@ skipping 171 matching lines @@
   ui_test_utils::NavigateToURL(browser(), chromium_org_url());
   EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR,
             CanConnectAndSendMessagesToMainFrame(invalid.get()));
 }
 
 #endif  // !defined(OS_WIN) - http://crbug.com/350517.
 
 }  // namespace
 
 };  // namespace extensions