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

chrome/common/service_process_util_posix.cc

 // Copyright (c) 2012 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_posix.h"
 
 #include <string.h>
 
-#include <utility>
+#include <memory>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/posix/eintr_wrapper.h"
+#include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
+#include "build/build_config.h"
 #include "chrome/common/multi_process_lock.h"
 
 namespace {
 int g_signal_socket = -1;
 }
 
 // Attempts to take a lock named |name|. If |waiting| is true then this will
 // make multiple attempts to acquire the lock.
 // Caller is responsible for ownership of the MultiProcessLock.
 MultiProcessLock* TakeNamedLock(const std::string& name, bool waiting) {
@@ skipping 55 matching lines @@
   }
 }
 
 ServiceProcessState::StateData::StateData() : set_action(false) {
   memset(sockets, -1, sizeof(sockets));
   memset(&old_action, 0, sizeof(old_action));
 }
 
 void ServiceProcessState::StateData::SignalReady(base::WaitableEvent* signal,
                                                  bool* success) {
-  DCHECK(task_runner->BelongsToCurrentThread());
   DCHECK_EQ(g_signal_socket, -1);
   DCHECK(!signal->IsSignaled());
   *success = base::MessageLoopForIO::current()->WatchFileDescriptor(
       sockets[0],
       true,
       base::MessageLoopForIO::WATCH_READ,
       &watcher,
       terminate_monitor.get());
   if (!*success) {
     DLOG(ERROR) << "WatchFileDescriptor";
@@ skipping 28 matching lines @@
     signal->Signal();
     return;
   }
 #elif defined(OS_POSIX)
   initializing_lock.reset();
 #endif  // OS_POSIX
   signal->Signal();
 }
 
 ServiceProcessState::StateData::~StateData() {
-  // StateData is destroyed on the thread that called SignalReady() (if any) to
-  // satisfy the requirement that base::FilePathWatcher is destroyed in sequence
-  // with base::FilePathWatcher::Watch().
-  DCHECK(!task_runner || task_runner->BelongsToCurrentThread());
-
   if (sockets[0] != -1) {
     if (IGNORE_EINTR(close(sockets[0]))) {
       DPLOG(ERROR) << "close";
     }
   }
   if (sockets[1] != -1) {
     if (IGNORE_EINTR(close(sockets[1]))) {
       DPLOG(ERROR) << "close";
     }
   }
   if (set_action) {
     if (sigaction(SIGTERM, &old_action, NULL) < 0) {
       DPLOG(ERROR) << "sigaction";
     }
   }
   g_signal_socket = -1;
 }
 
 void ServiceProcessState::CreateState() {
   DCHECK(!state_);
-  state_ = new StateData();
+  state_ = new StateData;
+
+  // Explicitly adding a reference here (and removing it in TearDownState)
+  // because StateData is refcounted on Mac and Linux so that methods can
+  // be called on other threads.
+  // It is not refcounted on Windows at this time.
+  state_->AddRef();
 }
 
-bool ServiceProcessState::SignalReady(
-    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-    const base::Closure& terminate_task) {
-  DCHECK(task_runner);
+bool ServiceProcessState::SignalReady(base::SingleThreadTaskRunner* task_runner,
+                                      const base::Closure& terminate_task) {
   DCHECK(state_);
 
-#if !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
   state_->running_lock.reset(TakeServiceRunningLock(true));
   if (state_->running_lock.get() == NULL) {
     return false;
   }
 #endif
   state_->terminate_monitor.reset(
       new ServiceProcessTerminateMonitor(terminate_task));
   if (pipe(state_->sockets) < 0) {
     DPLOG(ERROR) << "pipe";
     return false;
   }
   base::WaitableEvent signal_ready(
       base::WaitableEvent::ResetPolicy::MANUAL,
       base::WaitableEvent::InitialState::NOT_SIGNALED);
   bool success = false;
 
-  state_->task_runner = std::move(task_runner);
-  state_->task_runner->PostTask(
-      FROM_HERE, base::Bind(&ServiceProcessState::StateData::SignalReady,
-                            base::Unretained(state_), &signal_ready, &success));
+  task_runner->PostTask(FROM_HERE,
+                        base::Bind(&ServiceProcessState::StateData::SignalReady,
+                                   state_, &signal_ready, &success));
   signal_ready.Wait();
   return success;
 }
 
 void ServiceProcessState::TearDownState() {
-  if (state_ && state_->task_runner)
-    state_->task_runner->DeleteSoon(FROM_HERE, state_);
-  else
-    delete state_;
-  state_ = nullptr;
+  if (state_) {
+    state_->Release();
+    state_ = NULL;
+  }
 }