Chromium Code Reviews| Index: mojo/shell/shell_test_base.cc |
| diff --git a/mojo/shell/shell_test_base.cc b/mojo/shell/shell_test_base.cc |
| index da643a0d00ec2f2eb2323ffffcdb03800685436c..febf4bd1e17024cb2160a1583c4813f207c219ef 100644 |
| --- a/mojo/shell/shell_test_base.cc |
| +++ b/mojo/shell/shell_test_base.cc |
| @@ -33,17 +33,6 @@ void ShellTestBase::SetUp() { |
| test_server_->ServeFilesFromDirectory(service_dir); |
| } |
| -ScopedMessagePipeHandle ShellTestBase::ConnectToServiceViaNetwork( |
| - const GURL& application_url, |
| - const std::string& service_name) { |
| - shell_context_.mojo_url_resolver()->SetBaseURL( |
| - test_server_->base_url()); |
|
tim (not reviewing)
2014/08/22 22:24:21
This was the key to using NetworkService rather th
DaveMoore
2014/08/22 22:48:35
Whoops. I changed that accidentally. It's back now
|
| - |
| - return shell_context_.application_manager() |
| - ->ConnectToServiceByName(application_url, service_name) |
| - .Pass(); |
| -} |
| - |
| ScopedMessagePipeHandle ShellTestBase::ConnectToService( |
| const GURL& application_url, |
| const std::string& service_name) { |
| @@ -56,9 +45,8 @@ ScopedMessagePipeHandle ShellTestBase::ConnectToService( |
| shell_context_.mojo_url_resolver()->SetBaseURL( |
| net::FilePathToFileURL(service_dir)); |
| - return shell_context_.application_manager() |
| - ->ConnectToServiceByName(application_url, service_name) |
| - .Pass(); |
| + return shell_context_.ConnectToServiceByName( |
| + application_url, service_name).Pass(); |
| } |
| } // namespace test |