| Index: shell/shell_test_base.cc
|
| diff --git a/shell/shell_test_base.cc b/shell/shell_test_base.cc
|
| index 9be0abcacfd908fb31358a0f8fc9a6d172176b5e..f698e6e4b3aa9187910c02e10fd6ea001992a06f 100644
|
| --- a/shell/shell_test_base.cc
|
| +++ b/shell/shell_test_base.cc
|
| @@ -28,11 +28,9 @@ void QuitIfRunning() {
|
|
|
| } // namespace
|
|
|
| -ShellTestBase::ShellTestBase() {
|
| -}
|
| +ShellTestBase::ShellTestBase() {}
|
|
|
| -ShellTestBase::~ShellTestBase() {
|
| -}
|
| +ShellTestBase::~ShellTestBase() {}
|
|
|
| void ShellTestBase::SetUp() {
|
| CHECK(shell_context_.Init());
|
| @@ -48,7 +46,7 @@ mojo::ScopedMessagePipeHandle ShellTestBase::ConnectToService(
|
| const std::string& service_name) {
|
| mojo::ServiceProviderPtr services;
|
| shell_context_.application_manager()->ConnectToApplication(
|
| - application_url, GURL(), mojo::GetProxy(&services), nullptr,
|
| + application_url, GURL(), mojo::GetProxy(&services),
|
| base::Bind(&QuitIfRunning));
|
| mojo::MessagePipe pipe;
|
| services->ConnectToService(service_name, pipe.handle1.Pass());
|
|
|