mojo:: Rename mojo::GetProxy() to mojo::MakeRequest()

content/browser/loader/url_loader_factory_impl_unittest.cc

 // Copyright 2016 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 "content/browser/loader/url_loader_factory_impl.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
@@ skipping 84 matching lines @@
     ChildProcessSecurityPolicyImpl::GetInstance()->Add(kChildId);
     ChildProcessSecurityPolicyImpl::GetInstance()->GrantReadRawCookies(
         kChildId);
 
     resource_message_filter_->InitializeForTest();
     MojoAsyncResourceHandler::SetAllocationSizeForTesting(GetParam());
     rdh_.SetLoaderDelegate(&loader_deleate_);
 
     URLLoaderFactoryImpl::Create(
         resource_message_filter_->requester_info_for_test(),
-        mojo::GetProxy(&factory_));
+        mojo::MakeRequest(&factory_));
 
     // Calling this function creates a request context.
     browser_context_->GetResourceContext()->GetRequestContext();
     base::RunLoop().RunUntilIdle();
   }
 
   ~URLLoaderFactoryImplTest() override {
     ChildProcessSecurityPolicyImpl::GetInstance()->Remove(kChildId);
     rdh_.SetDelegate(nullptr);
     net::URLRequestFilter::GetInstance()->ClearHandlers();
@@ skipping 37 matching lines @@
   // Assume the file contents is small enough to be stored in the data pipe.
   request.url = net::URLRequestMockHTTPJob::GetMockUrl("hello.html");
   request.method = "GET";
   // |resource_type| can't be a frame type. It is because when PlzNavigate is
   // enabled, the url scheme of frame type requests from the renderer process
   // must be blob scheme.
   request.resource_type = RESOURCE_TYPE_XHR;
   // Need to set |request_initiator| for non main frame type request.
   request.request_initiator = url::Origin();
   factory_->CreateLoaderAndStart(
-      mojo::GetProxy(&loader, factory_.associated_group()), kRoutingId,
+      mojo::MakeRequest(&loader, factory_.associated_group()), kRoutingId,
       kRequestId, request,
       client.CreateRemoteAssociatedPtrInfo(factory_.associated_group()));
 
   ASSERT_FALSE(client.has_received_response());
   ASSERT_FALSE(client.response_body().is_valid());
   ASSERT_FALSE(client.has_received_completion());
 
   client.RunUntilResponseReceived();
 
   net::URLRequest* url_request =
@@ skipping 58 matching lines @@
   request.url = net::URLRequestFailedJob::GetMockHttpUrlWithFailurePhase(
       net::URLRequestFailedJob::START, net::ERR_TIMED_OUT);
   request.method = "GET";
   // |resource_type| can't be a frame type. It is because when PlzNavigate is
   // enabled, the url scheme of frame type requests from the renderer process
   // must be blob scheme.
   request.resource_type = RESOURCE_TYPE_XHR;
   // Need to set |request_initiator| for non main frame type request.
   request.request_initiator = url::Origin();
   factory_->CreateLoaderAndStart(
-      mojo::GetProxy(&loader, factory_.associated_group()), 2, 1, request,
+      mojo::MakeRequest(&loader, factory_.associated_group()), 2, 1, request,
       client.CreateRemoteAssociatedPtrInfo(factory_.associated_group()));
 
   client.RunUntilComplete();
   ASSERT_FALSE(client.has_received_response());
   ASSERT_FALSE(client.response_body().is_valid());
 
   EXPECT_EQ(net::ERR_TIMED_OUT, client.completion_status().error_code);
   EXPECT_EQ(0, client.completion_status().encoded_data_length);
   EXPECT_EQ(0, client.completion_status().encoded_body_length);
 }
 
 // In this case, the loading fails after receiving a response.
 TEST_P(URLLoaderFactoryImplTest, GetFailedResponse2) {
   NavigationResourceThrottle::set_ui_checks_always_succeed_for_testing(true);
   mojom::URLLoaderAssociatedPtr loader;
   ResourceRequest request;
   TestURLLoaderClient client;
   net::URLRequestFailedJob::AddUrlHandler();
   request.url = net::URLRequestFailedJob::GetMockHttpUrlWithFailurePhase(
       net::URLRequestFailedJob::READ_ASYNC, net::ERR_TIMED_OUT);
   request.method = "GET";
   // |resource_type| can't be a frame type. It is because when PlzNavigate is
   // enabled, the url scheme of frame type requests from the renderer process
   // must be blob scheme.
   request.resource_type = RESOURCE_TYPE_XHR;
   // Need to set |request_initiator| for non main frame type request.
   request.request_initiator = url::Origin();
   factory_->CreateLoaderAndStart(
-      mojo::GetProxy(&loader, factory_.associated_group()), 2, 1, request,
+      mojo::MakeRequest(&loader, factory_.associated_group()), 2, 1, request,
       client.CreateRemoteAssociatedPtrInfo(factory_.associated_group()));
 
   client.RunUntilComplete();
   ASSERT_FALSE(client.has_received_response());
   ASSERT_TRUE(client.response_body().is_valid());
 
   EXPECT_EQ(net::ERR_TIMED_OUT, client.completion_status().error_code);
   EXPECT_GT(client.completion_status().encoded_data_length, 0);
   EXPECT_EQ(0, client.completion_status().encoded_body_length);
 }
 
 // This test tests a case where resource loading is cancelled before started.
 TEST_P(URLLoaderFactoryImplTest, InvalidURL) {
   mojom::URLLoaderAssociatedPtr loader;
   ResourceRequest request;
   TestURLLoaderClient client;
   request.url = GURL();
   request.method = "GET";
   // |resource_type| can't be a frame type. It is because when PlzNavigate is
   // enabled, the url scheme of frame type requests from the renderer process
   // must be blob scheme.
   request.resource_type = RESOURCE_TYPE_XHR;
   // Need to set |request_initiator| for non main frame type request.
   request.request_initiator = url::Origin();
   ASSERT_FALSE(request.url.is_valid());
   factory_->CreateLoaderAndStart(
-      mojo::GetProxy(&loader, factory_.associated_group()), 2, 1, request,
+      mojo::MakeRequest(&loader, factory_.associated_group()), 2, 1, request,
       client.CreateRemoteAssociatedPtrInfo(factory_.associated_group()));
 
   client.RunUntilComplete();
   ASSERT_FALSE(client.has_received_response());
   ASSERT_FALSE(client.response_body().is_valid());
 
   EXPECT_EQ(net::ERR_ABORTED, client.completion_status().error_code);
 }
 
 // This test tests a case where resource loading is cancelled before started.
 TEST_P(URLLoaderFactoryImplTest, ShouldNotRequestURL) {
   mojom::URLLoaderAssociatedPtr loader;
   RejectingResourceDispatcherHostDelegate rdh_delegate;
   rdh_.SetDelegate(&rdh_delegate);
   ResourceRequest request;
   TestURLLoaderClient client;
   request.url = GURL("http://localhost/");
   request.method = "GET";
   // |resource_type| can't be a frame type. It is because when PlzNavigate is
   // enabled, the url scheme of frame type requests from the renderer process
   // must be blob scheme.
   request.resource_type = RESOURCE_TYPE_XHR;
   // Need to set |request_initiator| for non main frame type request.
   request.request_initiator = url::Origin();
   factory_->CreateLoaderAndStart(
-      mojo::GetProxy(&loader, factory_.associated_group()), 2, 1, request,
+      mojo::MakeRequest(&loader, factory_.associated_group()), 2, 1, request,
       client.CreateRemoteAssociatedPtrInfo(factory_.associated_group()));
 
   client.RunUntilComplete();
   rdh_.SetDelegate(nullptr);
 
   ASSERT_FALSE(client.has_received_response());
   ASSERT_FALSE(client.response_body().is_valid());
 
   EXPECT_EQ(net::ERR_ABORTED, client.completion_status().error_code);
 }
 
 TEST_P(URLLoaderFactoryImplTest, DownloadToFile) {
   constexpr int32_t kRoutingId = 1;
   constexpr int32_t kRequestId = 2;
 
   mojom::URLLoaderAssociatedPtr loader;
   base::FilePath root;
   PathService::Get(DIR_TEST_DATA, &root);
   net::URLRequestMockHTTPJob::AddUrlHandlers(root,
                                              BrowserThread::GetBlockingPool());
 
   ResourceRequest request;
   TestURLLoaderClient client;
   request.url = net::URLRequestMockHTTPJob::GetMockUrl("hello.html");
   request.method = "GET";
   request.resource_type = RESOURCE_TYPE_XHR;
   request.download_to_file = true;
   request.request_initiator = url::Origin();
   factory_->CreateLoaderAndStart(
-      mojo::GetProxy(&loader, factory_.associated_group()), kRoutingId,
+      mojo::MakeRequest(&loader, factory_.associated_group()), kRoutingId,
       kRequestId, request,
       client.CreateRemoteAssociatedPtrInfo(factory_.associated_group()));
   ASSERT_FALSE(client.has_received_response());
   ASSERT_FALSE(client.has_data_downloaded());
   ASSERT_FALSE(client.has_received_completion());
 
   client.RunUntilResponseReceived();
 
   net::URLRequest* url_request =
       rdh_.GetURLRequest(GlobalRequestID(kChildId, kRequestId));
@@ skipping 47 matching lines @@
   net::URLRequestSlowDownloadJob::AddUrlHandler();
 
   ResourceRequest request;
   TestURLLoaderClient client;
   request.url = GURL(net::URLRequestSlowDownloadJob::kKnownSizeUrl);
   request.method = "GET";
   request.resource_type = RESOURCE_TYPE_XHR;
   request.download_to_file = true;
   request.request_initiator = url::Origin();
   factory_->CreateLoaderAndStart(
-      mojo::GetProxy(&loader, factory_.associated_group()), kRoutingId,
+      mojo::MakeRequest(&loader, factory_.associated_group()), kRoutingId,
       kRequestId, request,
       client.CreateRemoteAssociatedPtrInfo(factory_.associated_group()));
   ASSERT_FALSE(client.has_received_response());
   ASSERT_FALSE(client.has_data_downloaded());
   ASSERT_FALSE(client.has_received_completion());
 
   client.RunUntilResponseReceived();
 
   net::URLRequest* url_request =
       rdh_.GetURLRequest(GlobalRequestID(kChildId, kRequestId));
@@ skipping 43 matching lines @@
   request.url = net::URLRequestMockHTTPJob::GetMockUrl("gzip-content.svgz");
   request.method = "GET";
   // |resource_type| can't be a frame type. It is because when PlzNavigate is
   // enabled, the url scheme of frame type requests from the renderer process
   // must be blob scheme.
   request.resource_type = RESOURCE_TYPE_XHR;
   // Need to set |request_initiator| for non main frame type request.
   request.request_initiator = url::Origin();
   request.report_raw_headers = true;
   factory_->CreateLoaderAndStart(
-      mojo::GetProxy(&loader, factory_.associated_group()), kRoutingId,
+      mojo::MakeRequest(&loader, factory_.associated_group()), kRoutingId,
       kRequestId, request,
       client.CreateRemoteAssociatedPtrInfo(factory_.associated_group()));
 
   client.RunUntilComplete();
 
   std::string contents;
   while (true) {
     char buffer[16];
     uint32_t read_size = sizeof(buffer);
     MojoResult r = mojo::ReadDataRaw(client.response_body(), buffer, &read_size,
@@ skipping 40 matching lines @@
   request.url = net::URLRequestFailedJob::GetMockHttpUrl(net::ERR_IO_PENDING);
   request.method = "GET";
   request.is_main_frame = true;
   // |resource_type| can't be a frame type. It is because when PlzNavigate is
   // enabled, the url scheme of frame type requests from the renderer process
   // must be blob scheme.
   request.resource_type = RESOURCE_TYPE_XHR;
   // Need to set |request_initiator| for non main frame type request.
   request.request_initiator = url::Origin();
   factory_->CreateLoaderAndStart(
-      mojo::GetProxy(&loader, factory_.associated_group()), kRoutingId,
+      mojo::MakeRequest(&loader, factory_.associated_group()), kRoutingId,
       kRequestId, request,
       client.CreateRemoteAssociatedPtrInfo(factory_.associated_group()));
 
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(rdh_.GetURLRequest(GlobalRequestID(kChildId, kRequestId)));
   ASSERT_FALSE(client.has_received_response());
   ASSERT_FALSE(client.response_body().is_valid());
   ASSERT_FALSE(client.has_received_completion());
 
   loader = nullptr;
   base::RunLoop().RunUntilIdle();
   ASSERT_FALSE(rdh_.GetURLRequest(GlobalRequestID(kChildId, kRequestId)));
 }
 
 INSTANTIATE_TEST_CASE_P(URLLoaderFactoryImplTest,
                         URLLoaderFactoryImplTest,
                         ::testing::Values(128, 32 * 1024));
 
 }  // namespace
 
 }  // namespace content