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

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

Issue 1822213002: Changes to get mash browser_tests shutdown working correctly (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: order Created 4 years, 9 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/test/base/mash_browser_tests_main.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 "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/process/process_handle.h" 10 #include "base/process/process_handle.h"
(...skipping 27 matching lines...) Expand all
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 mojo::shell::mojom::ShellClientRequest Init(); 41 mojo::shell::mojom::ShellClientRequest Init();
42 42
43 scoped_ptr<content::TestState> PrepareForTest( 43 scoped_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;
49
50 scoped_ptr<NativeRunnerDelegateImpl> native_runner_delegate_;
48 mojo::shell::BackgroundShell background_shell_; 51 mojo::shell::BackgroundShell background_shell_;
49 52
50 DISALLOW_COPY_AND_ASSIGN(MojoTestConnector); 53 DISALLOW_COPY_AND_ASSIGN(MojoTestConnector);
51 }; 54 };
52 55
53 #endif // CHROME_TEST_BASE_MOJO_TEST_CONNECTOR_H_ 56 #endif // CHROME_TEST_BASE_MOJO_TEST_CONNECTOR_H_
OLDNEW
« no previous file with comments | « chrome/test/base/mash_browser_tests_main.cc ('k') | chrome/test/base/mojo_test_connector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698