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

Side by Side Diff: mojo/runner/shell_test_main.cc

Issue 1260813007: Mandoline: Support about:blank URL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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/context.cc ('k') | no next file » | 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_suite.h" 10 #include "base/test/test_suite.h"
11 #include "mojo/runner/child_process.h" 11 #include "mojo/runner/child_process.h"
12 #include "mojo/runner/switches.h" 12 #include "mojo/runner/switches.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 #include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h"
14 15
15 int main(int argc, char** argv) { 16 int main(int argc, char** argv) {
16 base::CommandLine::Init(argc, argv); 17 base::CommandLine::Init(argc, argv);
17 const base::CommandLine& command_line = 18 const base::CommandLine& command_line =
18 *base::CommandLine::ForCurrentProcess(); 19 *base::CommandLine::ForCurrentProcess();
19 20
20 if (command_line.HasSwitch(switches::kChildProcess)) { 21 if (command_line.HasSwitch(switches::kChildProcess)) {
21 base::AtExitManager at_exit; 22 base::AtExitManager at_exit;
22 23
23 return mojo::runner::ChildProcessMain(); 24 return mojo::runner::ChildProcessMain();
24 } 25 }
25 26
26 base::TestSuite test_suite(argc, argv); 27 base::TestSuite test_suite(argc, argv);
28
29 mojo::embedder::test::InitWithSimplePlatformSupport();
30
27 return base::LaunchUnitTests( 31 return base::LaunchUnitTests(
28 argc, argv, 32 argc, argv,
29 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); 33 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
30 } 34 }
OLDNEW
« no previous file with comments | « mojo/runner/context.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698