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

Unified Diff: chrome/common/service_process_util_win.cc

Issue 6825063: Patch for bug 74983 (among others) to be applied to M11 696 branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/696/src
Patch Set: intentionally disabled mac tests. tested by hand. Created 9 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
« no previous file with comments | « chrome/common/service_process_util_unittest.cc ('k') | chrome/service/service_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/service_process_util_win.cc
diff --git a/chrome/common/service_process_util_win.cc b/chrome/common/service_process_util_win.cc
index adc5a72b12805a3b52b0a364607e5b44710de20b..c90644dbd216055ba74941a9c97c8889eaa97a69 100644
--- a/chrome/common/service_process_util_win.cc
+++ b/chrome/common/service_process_util_win.cc
@@ -128,12 +128,13 @@ bool ServiceProcessState::SignalReady(
base::MessageLoopProxy* message_loop_proxy, Task* shutdown_task) {
DCHECK(state_);
DCHECK(state_->ready_event.IsValid());
+ scoped_ptr<Task> scoped_shutdown_task(shutdown_task);
if (!SetEvent(state_->ready_event.Get())) {
return false;
}
if (shutdown_task) {
state_->shutdown_monitor.reset(
- new ServiceProcessShutdownMonitor(shutdown_task));
+ new ServiceProcessShutdownMonitor(scoped_shutdown_task.release()));
state_->shutdown_monitor->Start();
}
return true;
« no previous file with comments | « chrome/common/service_process_util_unittest.cc ('k') | chrome/service/service_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698