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

Side by Side Diff: mojo/runner/host/host_unittests.cc

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 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 | « mojo/runner/host/child_process_host_unittest.cc ('k') | mojo/shell/BUILD.gn » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/test/launcher/unit_test_launcher.h" 9 #include "base/test/launcher/unit_test_launcher.h"
10 #include "base/test/test_io_thread.h"
10 #include "base/test/test_suite.h" 11 #include "base/test/test_suite.h"
12 #include "mojo/edk/embedder/embedder.h"
11 #include "mojo/runner/host/child_process.h" 13 #include "mojo/runner/host/child_process.h"
12 #include "mojo/runner/host/switches.h" 14 #include "mojo/runner/host/switches.h"
13 #include "mojo/runner/init.h" 15 #include "mojo/runner/init.h"
14 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
15 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
16 17
17 int main(int argc, char** argv) { 18 int main(int argc, char** argv) {
18 base::CommandLine::Init(argc, argv); 19 base::CommandLine::Init(argc, argv);
19 const base::CommandLine& command_line = 20 const base::CommandLine& command_line =
20 *base::CommandLine::ForCurrentProcess(); 21 *base::CommandLine::ForCurrentProcess();
21 22
22 mojo::runner::WaitForDebuggerIfNecessary(); 23 mojo::runner::WaitForDebuggerIfNecessary();
23 24
24 if (command_line.HasSwitch(switches::kChildProcess)) { 25 if (command_line.HasSwitch(switches::kChildProcess)) {
25 base::AtExitManager at_exit; 26 base::AtExitManager at_exit;
26 27
27 return mojo::runner::ChildProcessMain(); 28 return mojo::runner::ChildProcessMain();
28 } 29 }
29 30
30 mojo::embedder::Init(); 31 base::TestSuite test_suite(argc, argv);
31 32
32 base::TestSuite test_suite(argc, argv); 33 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
34 mojo::edk::Init(test_io_thread.task_runner());
35
33 return base::LaunchUnitTests( 36 return base::LaunchUnitTests(
34 argc, argv, 37 argc, argv,
35 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); 38 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
36 } 39 }
OLDNEW
« no previous file with comments | « mojo/runner/host/child_process_host_unittest.cc ('k') | mojo/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698