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

Unified Diff: services/service_manager/background/background_service_manager_main.cc

Issue 2557213002: Build services as standalone executables (Closed)
Patch Set: remove DCHECKs with side effects -_- Created 4 years 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
« no previous file with comments | « services/catalog/reader.cc ('k') | services/service_manager/native_runner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/service_manager/background/background_service_manager_main.cc
diff --git a/services/service_manager/background/background_service_manager_main.cc b/services/service_manager/background/background_service_manager_main.cc
index 4ef836fc4922d4b50dfa652bf887f2bd43c7a6b5..6902ee46104b02e86f0aa1c900e3b6a550283199 100644
--- a/services/service_manager/background/background_service_manager_main.cc
+++ b/services/service_manager/background/background_service_manager_main.cc
@@ -9,33 +9,8 @@
#include "base/debug/debugger.h"
#include "base/process/launch.h"
#include "services/service_manager/runner/common/switches.h"
-#include "services/service_manager/runner/host/child_process.h"
#include "services/service_manager/runner/init.h"
-namespace service_manager {
-namespace {
-
-int RunChildProcess() {
- base::AtExitManager at_exit;
- InitializeLogging();
- WaitForDebuggerIfNecessary();
-#if !defined(OFFICIAL_BUILD) && defined(OS_WIN)
- base::RouteStdioToConsole(false);
-#endif
- return ChildProcessMain();
-}
-
-} // namespace
-} // namespace service_manager
-
int main(int argc, char** argv) {
- base::CommandLine::Init(argc, argv);
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kChildProcess)) {
- return service_manager::RunChildProcess();
- }
- // Reset CommandLine as most likely main() is going to use CommandLine too
- // and expect to be able to initialize it.
- base::CommandLine::Reset();
return MasterProcessMain(argc, argv);
}
« no previous file with comments | « services/catalog/reader.cc ('k') | services/service_manager/native_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698