summaryrefslogtreecommitdiffstats
path: root/chrome/service
diff options
context:
space:
mode:
authormvanouwerkerk <mvanouwerkerk@chromium.org>2015-07-21 11:43:08 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-21 18:43:49 +0000
commit98e52c65f19c80867ba2b15b12c80e4ded8d950c (patch)
tree8861cec9030cd0ea22578fdd4253f6299de7d39c /chrome/service
parent735c7487b0fdb3d75075ff1c760dd0a4d49c5b9a (diff)
downloadchromium_src-98e52c65f19c80867ba2b15b12c80e4ded8d950c.zip
chromium_src-98e52c65f19c80867ba2b15b12c80e4ded8d950c.tar.gz
chromium_src-98e52c65f19c80867ba2b15b12c80e4ded8d950c.tar.bz2
Delete redundant call to ServiceProcess::Teardown.
Currently Teardown is called twice on shutdown. The ServiceProcess is on the stack. It will call Teardown from its destructor when ServiceProcessMain returns. It looks like this redundancy has been there since the service process was first introduced in: https://codereview.chromium.org/2001009/ Review URL: https://codereview.chromium.org/1242873004 Cr-Commit-Position: refs/heads/master@{#339707}
Diffstat (limited to 'chrome/service')
-rw-r--r--chrome/service/service_main.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/service/service_main.cc b/chrome/service/service_main.cc
index bc4f6ea..03b0bcb 100644
--- a/chrome/service/service_main.cc
+++ b/chrome/service/service_main.cc
@@ -42,6 +42,5 @@ int ServiceProcessMain(const content::MainFunctionParams& parameters) {
} else {
LOG(ERROR) << "Service process failed to initialize";
}
- service_process.Teardown();
return 0;
}