| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/shell/shell_test_base.h" | 5 #include "mojo/runner/shell_test_base.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/path_service.h" | 12 #include "base/path_service.h" |
| 13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
| 14 #include "mojo/shell/filename_util.h" | 14 #include "mojo/runner/filename_util.h" |
| 15 #include "url/gurl.h" | 15 #include "url/gurl.h" |
| 16 | 16 |
| 17 namespace mojo { | 17 namespace mojo { |
| 18 namespace shell { | 18 namespace shell { |
| 19 namespace test { | 19 namespace test { |
| 20 | 20 |
| 21 namespace { | 21 namespace { |
| 22 | 22 |
| 23 void QuitIfRunning() { | 23 void QuitIfRunning() { |
| 24 if (base::MessageLoop::current() && | 24 if (base::MessageLoop::current() && |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 // mappings registered on the URL resolver are treated as shared libraries. | 64 // mappings registered on the URL resolver are treated as shared libraries. |
| 65 base::FilePath service_dir; | 65 base::FilePath service_dir; |
| 66 CHECK(PathService::Get(base::DIR_MODULE, &service_dir)); | 66 CHECK(PathService::Get(base::DIR_MODULE, &service_dir)); |
| 67 shell_context_.url_resolver()->SetMojoBaseURL(FilePathToFileURL(service_dir)); | 67 shell_context_.url_resolver()->SetMojoBaseURL(FilePathToFileURL(service_dir)); |
| 68 } | 68 } |
| 69 #endif | 69 #endif |
| 70 | 70 |
| 71 } // namespace test | 71 } // namespace test |
| 72 } // namespace shell | 72 } // namespace shell |
| 73 } // namespace mojo | 73 } // namespace mojo |
| OLD | NEW |