Index: mojo/public/cpp/bindings/tests/handle_passing_unittest.cc |
diff --git a/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc b/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc |
index feeeef2803568ec0dbb726d35bf9478baa0a6ce4..9d31620628cc9ef1bc059a2455ac61ef01fc0f0e 100644 |
--- a/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc |
+++ b/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc |
@@ -200,7 +200,7 @@ void DoStuff2(bool* got_response, |
TEST_F(HandlePassingTest, Basic) { |
sample::FactoryPtr factory; |
- SampleFactoryImpl factory_impl(GetProxy(&factory)); |
+ SampleFactoryImpl factory_impl(MakeRequest(&factory)); |
MessagePipe pipe0; |
EXPECT_TRUE(WriteTextMessage(pipe0.handle1.get(), kText1)); |
@@ -210,7 +210,7 @@ TEST_F(HandlePassingTest, Basic) { |
imported::ImportedInterfacePtr imported; |
base::RunLoop run_loop; |
- ImportedInterfaceImpl imported_impl(GetProxy(&imported), |
+ ImportedInterfaceImpl imported_impl(MakeRequest(&imported), |
run_loop.QuitClosure()); |
sample::RequestPtr request(sample::Request::New()); |
@@ -237,7 +237,7 @@ TEST_F(HandlePassingTest, Basic) { |
TEST_F(HandlePassingTest, PassInvalid) { |
sample::FactoryPtr factory; |
- SampleFactoryImpl factory_impl(GetProxy(&factory)); |
+ SampleFactoryImpl factory_impl(MakeRequest(&factory)); |
sample::RequestPtr request(sample::Request::New()); |
request->x = 1; |
@@ -258,7 +258,7 @@ TEST_F(HandlePassingTest, PassInvalid) { |
// Verifies DataPipeConsumer can be passed and read from. |
TEST_F(HandlePassingTest, DataPipe) { |
sample::FactoryPtr factory; |
- SampleFactoryImpl factory_impl(GetProxy(&factory)); |
+ SampleFactoryImpl factory_impl(MakeRequest(&factory)); |
// Writes a string to a data pipe and passes the data pipe (consumer) to the |
// factory. |
@@ -296,7 +296,7 @@ TEST_F(HandlePassingTest, DataPipe) { |
TEST_F(HandlePassingTest, PipesAreClosed) { |
sample::FactoryPtr factory; |
- SampleFactoryImpl factory_impl(GetProxy(&factory)); |
+ SampleFactoryImpl factory_impl(MakeRequest(&factory)); |
MessagePipe extra_pipe; |
@@ -322,12 +322,12 @@ TEST_F(HandlePassingTest, PipesAreClosed) { |
TEST_F(HandlePassingTest, CreateNamedObject) { |
sample::FactoryPtr factory; |
- SampleFactoryImpl factory_impl(GetProxy(&factory)); |
+ SampleFactoryImpl factory_impl(MakeRequest(&factory)); |
sample::NamedObjectPtr object1; |
EXPECT_FALSE(object1); |
- InterfaceRequest<sample::NamedObject> object1_request = GetProxy(&object1); |
+ InterfaceRequest<sample::NamedObject> object1_request = MakeRequest(&object1); |
EXPECT_TRUE(object1_request.is_pending()); |
factory->CreateNamedObject(std::move(object1_request)); |
EXPECT_FALSE(object1_request.is_pending()); // We've passed the request. |
@@ -336,7 +336,7 @@ TEST_F(HandlePassingTest, CreateNamedObject) { |
object1->SetName("object1"); |
sample::NamedObjectPtr object2; |
- factory->CreateNamedObject(GetProxy(&object2)); |
+ factory->CreateNamedObject(MakeRequest(&object2)); |
object2->SetName("object2"); |
base::RunLoop run_loop, run_loop2; |