Revert of Require FilePathWatcher destructor to be called in sequence with Watch().

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 <algorithm>
 #include <memory>
 
 #include "base/callback.h"
@@ skipping 117 matching lines @@
   service_process_ready_event.Set(
       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(
-    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-    const base::Closure& terminate_task) {
+bool ServiceProcessState::SignalReady(base::SingleThreadTaskRunner* task_runner,
+                                      const base::Closure& terminate_task) {
   DCHECK(state_);
   DCHECK(state_->ready_event.IsValid());
   if (!SetEvent(state_->ready_event.Get())) {
     return false;
   }
   if (!terminate_task.is_null()) {
     state_->terminate_monitor.reset(
         new ServiceProcessTerminateMonitor(terminate_task));
     state_->terminate_monitor->Start();
   }
@@ skipping 20 matching lines @@
       HKEY_CURRENT_USER,
       base::UTF8ToWide(GetObsoleteServiceProcessAutoRunKey()));
   return base::win::RemoveCommandFromAutoRun(
       HKEY_CURRENT_USER, base::UTF8ToWide(GetServiceProcessAutoRunKey()));
 }
 
 void ServiceProcessState::TearDownState() {
   delete state_;
   state_ = NULL;
 }