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

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

Issue 1065433002: Simplify some mojo_shell code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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/shell/child_process.h" 11 #include "mojo/shell/child_process.h"
12 #include "mojo/shell/switches.h" 12 #include "mojo/shell/switches.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 int main(int argc, char** argv) { 15 int main(int argc, char** argv) {
16 base::CommandLine::Init(argc, argv); 16 base::CommandLine::Init(argc, argv);
17 const base::CommandLine& command_line = 17 const base::CommandLine& command_line =
18 *base::CommandLine::ForCurrentProcess(); 18 *base::CommandLine::ForCurrentProcess();
19 19
20 if (command_line.HasSwitch(switches::kChildProcess)) { 20 if (command_line.HasSwitch(switches::kChildProcess)) {
21 base::AtExitManager at_exit; 21 base::AtExitManager at_exit;
22 scoped_ptr<mojo::shell::ChildProcess> child_process = 22
23 mojo::shell::ChildProcess::Create(command_line); 23 return mojo::shell::ChildProcessMain();
24 CHECK(child_process);
25 child_process->Main();
26 return 0;
27 } 24 }
28 25
29 base::TestSuite test_suite(argc, argv); 26 base::TestSuite test_suite(argc, argv);
30 return base::LaunchUnitTests( 27 return base::LaunchUnitTests(
31 argc, argv, 28 argc, argv,
32 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); 29 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
33 } 30 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698