| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef CHROME_TEST_BASE_MOJO_TEST_CONNECTOR_H_ | 5 #ifndef CHROME_TEST_BASE_MOJO_TEST_CONNECTOR_H_ |
| 6 #define CHROME_TEST_BASE_MOJO_TEST_CONNECTOR_H_ | 6 #define CHROME_TEST_BASE_MOJO_TEST_CONNECTOR_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 static const char kTestSwitch[]; | 31 static const char kTestSwitch[]; |
| 32 | 32 |
| 33 // Command line switch added to all apps that are expected to be provided by | 33 // Command line switch added to all apps that are expected to be provided by |
| 34 // browser_tests. | 34 // browser_tests. |
| 35 static const char kMashApp[]; | 35 static const char kMashApp[]; |
| 36 | 36 |
| 37 MojoTestConnector(); | 37 MojoTestConnector(); |
| 38 ~MojoTestConnector(); | 38 ~MojoTestConnector(); |
| 39 | 39 |
| 40 // Initializes the background thread the Shell runs on. | 40 // Initializes the background thread the Shell runs on. |
| 41 shell::mojom::ServiceRequest Init(); | 41 service_manager::mojom::ServiceRequest Init(); |
| 42 | 42 |
| 43 std::unique_ptr<content::TestState> PrepareForTest( | 43 std::unique_ptr<content::TestState> PrepareForTest( |
| 44 base::CommandLine* command_line, | 44 base::CommandLine* command_line, |
| 45 base::TestLauncher::LaunchOptions* test_launch_options); | 45 base::TestLauncher::LaunchOptions* test_launch_options); |
| 46 | 46 |
| 47 private: | 47 private: |
| 48 class NativeRunnerDelegateImpl; | 48 class NativeRunnerDelegateImpl; |
| 49 | 49 |
| 50 std::unique_ptr<NativeRunnerDelegateImpl> native_runner_delegate_; | 50 std::unique_ptr<NativeRunnerDelegateImpl> native_runner_delegate_; |
| 51 | 51 |
| 52 shell::BackgroundShell background_shell_; | 52 service_manager::BackgroundShell background_shell_; |
| 53 | 53 |
| 54 DISALLOW_COPY_AND_ASSIGN(MojoTestConnector); | 54 DISALLOW_COPY_AND_ASSIGN(MojoTestConnector); |
| 55 }; | 55 }; |
| 56 | 56 |
| 57 #endif // CHROME_TEST_BASE_MOJO_TEST_CONNECTOR_H_ | 57 #endif // CHROME_TEST_BASE_MOJO_TEST_CONNECTOR_H_ |
| OLD | NEW |