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

Unified Diff: shell/shell_test_main.cc

Issue 1061413002: Shell: Make a separate binary for child processes. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased 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 side-by-side diff with in-line comments
Download patch
« shell/desktop/main.cc ('K') | « shell/desktop/main.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/shell_test_main.cc
diff --git a/shell/shell_test_main.cc b/shell/shell_test_main.cc
index bad2f07148a4ca965a3d4702ebb3af946164604d..6df22154e4a77bceb5f921ee66e86d695e3561f0 100644
--- a/shell/shell_test_main.cc
+++ b/shell/shell_test_main.cc
@@ -8,19 +8,14 @@
#include "base/logging.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "shell/child_main.h"
#include "shell/switches.h"
#include "testing/gtest/include/gtest/gtest.h"
int main(int argc, char** argv) {
base::CommandLine::Init(argc, argv);
- const base::CommandLine& command_line =
- *base::CommandLine::ForCurrentProcess();
- if (command_line.HasSwitch(switches::kChildProcess)) {
- base::AtExitManager at_exit;
- return mojo::shell::ChildMain();
- }
+ CHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kChildProcess));
base::TestSuite test_suite(argc, argv);
return base::LaunchUnitTests(
« shell/desktop/main.cc ('K') | « shell/desktop/main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698