NewRunnable* conversion to base::Bind for service process utils.

chrome/common/service_process_util_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/service_process_util.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 33 matching lines @@
   std::string scoped_name = WideToUTF8(user_data_dir.value());
   std::replace(scoped_name.begin(), scoped_name.end(), '\\', '!');
   std::replace(scoped_name.begin(), scoped_name.end(), '/', '!');
   scoped_name.append("_service_run");
   return scoped_name;
 }
 
 class ServiceProcessTerminateMonitor
     : public base::win::ObjectWatcher::Delegate {
  public:
-  explicit ServiceProcessTerminateMonitor(Task* terminate_task)
+  explicit ServiceProcessTerminateMonitor(const base::Closure& terminate_task)
       : terminate_task_(terminate_task) {
   }
   void Start() {
     string16 event_name = GetServiceProcessTerminateEventName();
     DCHECK(event_name.length() <= MAX_PATH);
     terminate_event_.Set(CreateEvent(NULL, TRUE, FALSE, event_name.c_str()));
     watcher_.StartWatching(terminate_event_.Get(), this);
   }
 
   // base::ObjectWatcher::Delegate implementation.
   virtual void OnObjectSignaled(HANDLE object) {
-    terminate_task_->Run();
-    terminate_task_.reset();
+    if (!terminate_task_.is_null()) {
+      terminate_task_.Run();
+      terminate_task_.Reset();
+    }
   }
 
  private:
   base::win::ScopedHandle terminate_event_;
   base::win::ObjectWatcher watcher_;
-  scoped_ptr<Task> terminate_task_;
+  base::Closure terminate_task_;
 };
 
 }  // namespace
 
 // Gets the name of the service process IPC channel.
 IPC::ChannelHandle GetServiceProcessChannel() {
   return GetServiceProcessScopedVersionedName("_service_ipc");
 }
 
 bool ForceServiceProcessShutdown(const std::string& version,
@@ skipping 40 matching lines @@
       CreateEvent(NULL, TRUE, FALSE, event_name.c_str()));
   DWORD error = GetLastError();
   if ((error == ERROR_ALREADY_EXISTS) || (error == ERROR_ACCESS_DENIED))
     return false;
   DCHECK(service_process_ready_event.IsValid());
   state_->ready_event.Set(service_process_ready_event.Take());
   return true;
 }
 
 bool ServiceProcessState::SignalReady(
-    base::MessageLoopProxy* message_loop_proxy, Task* terminate_task) {
+    base::MessageLoopProxy* message_loop_proxy,
+    const base::Closure& terminate_task) {
   DCHECK(state_);
   DCHECK(state_->ready_event.IsValid());
-  scoped_ptr<Task> scoped_terminate_task(terminate_task);
   if (!SetEvent(state_->ready_event.Get())) {
     return false;
   }
-  if (terminate_task) {
+  if (!terminate_task.is_null()) {
     state_->terminate_monitor.reset(
-        new ServiceProcessTerminateMonitor(scoped_terminate_task.release()));
+        new ServiceProcessTerminateMonitor(terminate_task));
     state_->terminate_monitor->Start();
   }
   return true;
 }
 
 bool ServiceProcessState::AddToAutoRun() {
   DCHECK(autorun_command_line_.get());
   // Remove the old autorun value first because we changed the naming scheme
   // for the autorun value name.
   base::win::RemoveCommandFromAutoRun(
@@ skipping 10 matching lines @@
   base::win::RemoveCommandFromAutoRun(
       HKEY_CURRENT_USER, UTF8ToWide(GetObsoleteServiceProcessAutoRunKey()));
   return base::win::RemoveCommandFromAutoRun(
       HKEY_CURRENT_USER, UTF8ToWide(GetServiceProcessAutoRunKey()));
 }
 
 void ServiceProcessState::TearDownState() {
   delete state_;
   state_ = NULL;
 }