Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(643)

Side by Side Diff: chrome/test/base/mojo_test_connector.h

Issue 1915053004: mus/chrome: Always wait for the mojo shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/app/mash/mash_runner.cc ('k') | chrome/test/base/mojo_test_connector.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 28 matching lines...) Expand all
39 ~MojoTestConnector(); 39 ~MojoTestConnector();
40 40
41 // Initializes the background thread the Shell runs on. 41 // Initializes the background thread the Shell runs on.
42 shell::mojom::ShellClientRequest Init(); 42 shell::mojom::ShellClientRequest Init();
43 43
44 std::unique_ptr<content::TestState> PrepareForTest( 44 std::unique_ptr<content::TestState> PrepareForTest(
45 base::CommandLine* command_line, 45 base::CommandLine* command_line,
46 base::TestLauncher::LaunchOptions* test_launch_options); 46 base::TestLauncher::LaunchOptions* test_launch_options);
47 47
48 private: 48 private:
49 class NativeRunnerDelegateImpl;
50
51 std::unique_ptr<NativeRunnerDelegateImpl> native_runner_delegate_;
52 shell::BackgroundShell background_shell_; 49 shell::BackgroundShell background_shell_;
53 50
54 DISALLOW_COPY_AND_ASSIGN(MojoTestConnector); 51 DISALLOW_COPY_AND_ASSIGN(MojoTestConnector);
55 }; 52 };
56 53
57 #endif // CHROME_TEST_BASE_MOJO_TEST_CONNECTOR_H_ 54 #endif // CHROME_TEST_BASE_MOJO_TEST_CONNECTOR_H_
OLDNEW
« no previous file with comments | « chrome/app/mash/mash_runner.cc ('k') | chrome/test/base/mojo_test_connector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698