| Index: shell/shell_test_base.cc
|
| diff --git a/mojo/shell/shell_test_base.cc b/shell/shell_test_base.cc
|
| similarity index 84%
|
| rename from mojo/shell/shell_test_base.cc
|
| rename to shell/shell_test_base.cc
|
| index b9bb7e072e117fa844c6771944694a1edfdbb1ad..daeef191b883157926c56326cf3203473ae36102 100644
|
| --- a/mojo/shell/shell_test_base.cc
|
| +++ b/shell/shell_test_base.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mojo/shell/shell_test_base.h"
|
| +#include "shell/shell_test_base.h"
|
|
|
| #include "base/command_line.h"
|
| #include "base/files/file_path.h"
|
| @@ -10,7 +10,7 @@
|
| #include "base/logging.h"
|
| #include "base/path_service.h"
|
| #include "build/build_config.h"
|
| -#include "mojo/shell/filename_util.h"
|
| +#include "shell/filename_util.h"
|
| #include "url/gurl.h"
|
|
|
| namespace mojo {
|
| @@ -41,15 +41,15 @@ ScopedMessagePipeHandle ShellTestBase::ConnectToService(
|
| shell_context_.mojo_url_resolver()->SetBaseURL(
|
| FilePathToFileURL(service_dir));
|
|
|
| - return shell_context_.ConnectToServiceByName(
|
| - application_url, service_name).Pass();
|
| + return shell_context_.ConnectToServiceByName(application_url, service_name)
|
| + .Pass();
|
| }
|
|
|
| ScopedMessagePipeHandle ShellTestBase::ConnectToServiceViaNetwork(
|
| const GURL& application_url,
|
| const std::string& service_name) {
|
| - return shell_context_.ConnectToServiceByName(
|
| - application_url, service_name).Pass();
|
| + return shell_context_.ConnectToServiceByName(application_url, service_name)
|
| + .Pass();
|
| }
|
|
|
| } // namespace test
|
|
|