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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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 <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/process/process_handle.h" 11 #include "base/process/process_handle.h"
12 #include "base/test/launcher/test_launcher.h" 12 #include "base/test/launcher/test_launcher.h"
13 #include "services/shell/background/background_shell.h" 13 #include "services/service_manager/background/background_shell.h"
14 #include "services/shell/public/interfaces/service.mojom.h" 14 #include "services/service_manager/public/interfaces/service.mojom.h"
15 15
16 namespace base { 16 namespace base {
17 class CommandLine; 17 class CommandLine;
18 } 18 }
19 19
20 namespace content { 20 namespace content {
21 class TestState; 21 class TestState;
22 } 22 }
23 23
24 // MojoTestConnector in responsible for providing the necessary wiring for 24 // MojoTestConnector in responsible for providing the necessary wiring for
(...skipping 23 matching lines...) Expand all
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 shell::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_
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