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/runner/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" |
(...skipping 12 matching lines...) Expand all Loading... |
23 | 23 |
24 void QuitIfRunning() { | 24 void QuitIfRunning() { |
25 if (base::MessageLoop::current() && | 25 if (base::MessageLoop::current() && |
26 base::MessageLoop::current()->is_running()) { | 26 base::MessageLoop::current()->is_running()) { |
27 base::MessageLoop::current()->QuitWhenIdle(); | 27 base::MessageLoop::current()->QuitWhenIdle(); |
28 } | 28 } |
29 } | 29 } |
30 | 30 |
31 } // namespace | 31 } // namespace |
32 | 32 |
33 ShellTestBase::ShellTestBase() : shell_context_(GetTestAppFilePath()) {} | 33 ShellTestBase::ShellTestBase() { |
| 34 } |
34 | 35 |
35 ShellTestBase::~ShellTestBase() { | 36 ShellTestBase::~ShellTestBase() { |
36 } | 37 } |
37 | 38 |
38 void ShellTestBase::SetUp() { | 39 void ShellTestBase::SetUp() { |
39 CHECK(shell_context_.Init()); | 40 CHECK(shell_context_.Init()); |
| 41 SetUpTestApplications(); |
40 } | 42 } |
41 | 43 |
42 void ShellTestBase::TearDown() { | 44 void ShellTestBase::TearDown() { |
43 shell_context_.Shutdown(); | 45 shell_context_.Shutdown(); |
44 } | 46 } |
45 | 47 |
46 ScopedMessagePipeHandle ShellTestBase::ConnectToService( | 48 ScopedMessagePipeHandle ShellTestBase::ConnectToService( |
47 const GURL& application_url, | 49 const GURL& application_url, |
48 const std::string& service_name) { | 50 const std::string& service_name) { |
49 ServiceProviderPtr services; | 51 ServiceProviderPtr services; |
50 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 52 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
51 request->url = mojo::String::From(application_url.spec()); | 53 request->url = mojo::String::From(application_url.spec()); |
52 shell_context_.application_manager()->ConnectToApplication( | 54 shell_context_.application_manager()->ConnectToApplication( |
53 nullptr, request.Pass(), std::string(), GetProxy(&services), nullptr, | 55 nullptr, request.Pass(), std::string(), GetProxy(&services), nullptr, |
54 shell::GetPermissiveCapabilityFilter(), base::Bind(&QuitIfRunning), | 56 shell::GetPermissiveCapabilityFilter(), base::Bind(&QuitIfRunning), |
55 shell::EmptyConnectCallback()); | 57 shell::EmptyConnectCallback()); |
56 MessagePipe pipe; | 58 MessagePipe pipe; |
57 services->ConnectToService(service_name, pipe.handle1.Pass()); | 59 services->ConnectToService(service_name, pipe.handle1.Pass()); |
58 return pipe.handle0.Pass(); | 60 return pipe.handle0.Pass(); |
59 } | 61 } |
60 | 62 |
61 #if !defined(OS_ANDROID) | 63 #if !defined(OS_ANDROID) |
62 base::FilePath ShellTestBase::GetTestAppFilePath() const { | 64 void ShellTestBase::SetUpTestApplications() { |
63 base::FilePath shell_dir; | 65 // Set the URLResolver origin to be the same as the base file path for |
64 PathService::Get(base::DIR_MODULE, &shell_dir); | 66 // local files. This is primarily for test convenience, so that references |
65 return shell_dir; | 67 // to unknown mojo: URLs that do not have specific local file or custom |
| 68 // mappings registered on the URL resolver are treated as shared libraries. |
| 69 base::FilePath service_dir; |
| 70 CHECK(PathService::Get(base::DIR_MODULE, &service_dir)); |
| 71 shell_context_.url_resolver()->SetMojoBaseURL( |
| 72 util::FilePathToFileURL(service_dir)); |
66 } | 73 } |
67 #endif | 74 #endif |
68 | 75 |
69 } // namespace test | 76 } // namespace test |
70 } // namespace runner | 77 } // namespace runner |
71 } // namespace mojo | 78 } // namespace mojo |
OLD | NEW |