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

net/dns/mojo_host_resolver_impl_unittest.cc

 // Copyright 2015 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/dns/mojo_host_resolver_impl.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 144 matching lines @@
       run_loop.Run();
     }
   }
 
   CallbackMockHostResolver mock_host_resolver_;
   std::unique_ptr<MojoHostResolverImpl> resolver_service_;
 };
 
 TEST_F(MojoHostResolverImplTest, Resolve) {
   interfaces::HostResolverRequestClientPtr client_ptr;
-  TestRequestClient client(mojo::GetProxy(&client_ptr));
+  TestRequestClient client(mojo::MakeRequest(&client_ptr));
 
   resolver_service_->Resolve(CreateRequest("example.com", 80, false),
                              std::move(client_ptr));
   client.WaitForResult();
 
   EXPECT_THAT(client.error_, IsOk());
   AddressList& address_list = client.results_;
   EXPECT_EQ(1U, address_list.size());
   EXPECT_EQ("1.2.3.4:80", address_list[0].ToString());
 }
 
 TEST_F(MojoHostResolverImplTest, ResolveSynchronous) {
   interfaces::HostResolverRequestClientPtr client_ptr;
-  TestRequestClient client(mojo::GetProxy(&client_ptr));
+  TestRequestClient client(mojo::MakeRequest(&client_ptr));
 
   mock_host_resolver_.set_synchronous_mode(true);
 
   resolver_service_->Resolve(CreateRequest("example.com", 80, false),
                              std::move(client_ptr));
   client.WaitForResult();
 
   EXPECT_THAT(client.error_, IsOk());
   AddressList& address_list = client.results_;
   EXPECT_EQ(1U, address_list.size());
   EXPECT_EQ("1.2.3.4:80", address_list[0].ToString());
 }
 
 TEST_F(MojoHostResolverImplTest, ResolveMultiple) {
   interfaces::HostResolverRequestClientPtr client1_ptr;
-  TestRequestClient client1(mojo::GetProxy(&client1_ptr));
+  TestRequestClient client1(mojo::MakeRequest(&client1_ptr));
   interfaces::HostResolverRequestClientPtr client2_ptr;
-  TestRequestClient client2(mojo::GetProxy(&client2_ptr));
+  TestRequestClient client2(mojo::MakeRequest(&client2_ptr));
 
   mock_host_resolver_.set_ondemand_mode(true);
 
   resolver_service_->Resolve(CreateRequest("example.com", 80, false),
                              std::move(client1_ptr));
   resolver_service_->Resolve(CreateRequest("chromium.org", 80, false),
                              std::move(client2_ptr));
   WaitForRequests(2);
   mock_host_resolver_.ResolveAllPending();
 
   client1.WaitForResult();
   client2.WaitForResult();
 
   EXPECT_THAT(client1.error_, IsOk());
   AddressList& address_list1 = client1.results_;
   EXPECT_EQ(1U, address_list1.size());
   EXPECT_EQ("1.2.3.4:80", address_list1[0].ToString());
   EXPECT_THAT(client2.error_, IsOk());
   AddressList& address_list2 = client2.results_;
   EXPECT_EQ(1U, address_list2.size());
   EXPECT_EQ("8.8.8.8:80", address_list2[0].ToString());
 }
 
 TEST_F(MojoHostResolverImplTest, ResolveDuplicate) {
   interfaces::HostResolverRequestClientPtr client1_ptr;
-  TestRequestClient client1(mojo::GetProxy(&client1_ptr));
+  TestRequestClient client1(mojo::MakeRequest(&client1_ptr));
   interfaces::HostResolverRequestClientPtr client2_ptr;
-  TestRequestClient client2(mojo::GetProxy(&client2_ptr));
+  TestRequestClient client2(mojo::MakeRequest(&client2_ptr));
 
   mock_host_resolver_.set_ondemand_mode(true);
 
   resolver_service_->Resolve(CreateRequest("example.com", 80, false),
                              std::move(client1_ptr));
   resolver_service_->Resolve(CreateRequest("example.com", 80, false),
                              std::move(client2_ptr));
   WaitForRequests(2);
   mock_host_resolver_.ResolveAllPending();
 
   client1.WaitForResult();
   client2.WaitForResult();
 
   EXPECT_THAT(client1.error_, IsOk());
   AddressList& address_list1 = client1.results_;
   EXPECT_EQ(1U, address_list1.size());
   EXPECT_EQ("1.2.3.4:80", address_list1[0].ToString());
   EXPECT_THAT(client2.error_, IsOk());
   AddressList& address_list2 = client2.results_;
   EXPECT_EQ(1U, address_list2.size());
   EXPECT_EQ("1.2.3.4:80", address_list2[0].ToString());
 }
 
 TEST_F(MojoHostResolverImplTest, ResolveFailure) {
   interfaces::HostResolverRequestClientPtr client_ptr;
-  TestRequestClient client(mojo::GetProxy(&client_ptr));
+  TestRequestClient client(mojo::MakeRequest(&client_ptr));
 
   resolver_service_->Resolve(CreateRequest("failure.fail", 80, false),
                              std::move(client_ptr));
   client.WaitForResult();
 
   EXPECT_THAT(client.error_, IsError(net::ERR_NAME_NOT_RESOLVED));
   EXPECT_TRUE(client.results_.empty());
 }
 
 TEST_F(MojoHostResolverImplTest, DestroyClient) {
   interfaces::HostResolverRequestClientPtr client_ptr;
   std::unique_ptr<TestRequestClient> client(
-      new TestRequestClient(mojo::GetProxy(&client_ptr)));
+      new TestRequestClient(mojo::MakeRequest(&client_ptr)));
 
   mock_host_resolver_.set_ondemand_mode(true);
 
   resolver_service_->Resolve(CreateRequest("example.com", 80, false),
                              std::move(client_ptr));
   WaitForRequests(1);
 
   client.reset();
   base::RunLoop().RunUntilIdle();
 
   mock_host_resolver_.ResolveAllPending();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace net