Chromium Code Reviews| Index: mojo/runner/shell_test_base.cc |
| diff --git a/mojo/runner/shell_test_base.cc b/mojo/runner/shell_test_base.cc |
| index f58780f0226988198589905b2620215677c7331f..0eb76fcb4ef9e6e6295caa21ecb7e813dde1303c 100644 |
| --- a/mojo/runner/shell_test_base.cc |
| +++ b/mojo/runner/shell_test_base.cc |
| @@ -51,8 +51,8 @@ ScopedMessagePipeHandle ShellTestBase::ConnectToService( |
| mojo::URLRequestPtr request(mojo::URLRequest::New()); |
| request->url = mojo::String::From(application_url.spec()); |
| shell_context_.application_manager()->ConnectToApplication( |
| - request.Pass(), std::string(), GURL(), GetProxy(&services), nullptr, |
| - base::Bind(&QuitIfRunning)); |
| + NULL, request.Pass(), std::string(), GURL(), GetProxy(&services), nullptr, |
|
sky
2015/07/22 15:57:45
NULL -> nullptr
|
| + nullptr, base::Bind(&QuitIfRunning)); |
| MessagePipe pipe; |
| services->ConnectToService(service_name, pipe.handle1.Pass()); |
| return pipe.handle0.Pass(); |