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

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

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan
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/test/base/mojo_test_connector.h ('k') | chromecast/browser/DEPS » ('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 #include "chrome/test/base/mojo_test_connector.h" 5 #include "chrome/test/base/mojo_test_connector.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/synchronization/waitable_event.h" 12 #include "base/synchronization/waitable_event.h"
13 #include "base/threading/thread.h" 13 #include "base/threading/thread.h"
14 #include "content/public/common/content_switches.h" 14 #include "content/public/common/content_switches.h"
15 #include "content/public/test/test_launcher.h" 15 #include "content/public/test/test_launcher.h"
16 #include "mojo/edk/embedder/embedder.h" 16 #include "mojo/edk/embedder/embedder.h"
17 #include "mojo/edk/embedder/platform_channel_pair.h" 17 #include "mojo/edk/embedder/platform_channel_pair.h"
18 #include "mojo/edk/embedder/process_delegate.h" 18 #include "mojo/edk/embedder/process_delegate.h"
19 #include "mojo/public/cpp/bindings/interface_request.h" 19 #include "mojo/public/cpp/bindings/interface_request.h"
20 #include "mojo/services/catalog/store.h" 20 #include "mojo/services/catalog/store.h"
21 #include "mojo/shell/background/tests/test_catalog_store.h" 21 #include "services/shell/background/tests/test_catalog_store.h"
22 #include "mojo/shell/native_runner_delegate.h" 22 #include "services/shell/native_runner_delegate.h"
23 #include "mojo/shell/public/cpp/connector.h" 23 #include "services/shell/public/cpp/connector.h"
24 #include "mojo/shell/public/cpp/shell_client.h" 24 #include "services/shell/public/cpp/shell_client.h"
25 #include "mojo/shell/public/cpp/shell_connection.h" 25 #include "services/shell/public/cpp/shell_connection.h"
26 #include "mojo/shell/runner/common/client_util.h" 26 #include "services/shell/runner/common/client_util.h"
27 #include "mojo/shell/runner/common/switches.h" 27 #include "services/shell/runner/common/switches.h"
28 #include "mojo/shell/shell.h" 28 #include "services/shell/shell.h"
29 #include "mojo/shell/switches.h" 29 #include "services/shell/switches.h"
30 30
31 using mojo::shell::mojom::ShellClient; 31 using mojo::shell::mojom::ShellClient;
32 using mojo::shell::mojom::ShellClientPtr; 32 using mojo::shell::mojom::ShellClientPtr;
33 33
34 namespace { 34 namespace {
35 35
36 const char kTestRunnerName[] = "mojo:test-runner"; 36 const char kTestRunnerName[] = "mojo:test-runner";
37 const char kTestName[] = "exe:chrome"; 37 const char kTestName[] = "exe:chrome";
38 38
39 // Returns the Dictionary value of |parent| under the specified key, creating 39 // Returns the Dictionary value of |parent| under the specified key, creating
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 255
256 MojoTestConnector::~MojoTestConnector() {} 256 MojoTestConnector::~MojoTestConnector() {}
257 257
258 scoped_ptr<content::TestState> MojoTestConnector::PrepareForTest( 258 scoped_ptr<content::TestState> MojoTestConnector::PrepareForTest(
259 base::CommandLine* command_line, 259 base::CommandLine* command_line,
260 base::TestLauncher::LaunchOptions* test_launch_options) { 260 base::TestLauncher::LaunchOptions* test_launch_options) {
261 scoped_ptr<MojoTestState> test_state(new MojoTestState(&background_shell_)); 261 scoped_ptr<MojoTestState> test_state(new MojoTestState(&background_shell_));
262 test_state->Init(command_line, test_launch_options); 262 test_state->Init(command_line, test_launch_options);
263 return std::move(test_state); 263 return std::move(test_state);
264 } 264 }
OLDNEW
« no previous file with comments | « chrome/test/base/mojo_test_connector.h ('k') | chromecast/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698