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

chrome/common/service_process_util.h

 // 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.
 
 #ifndef CHROME_COMMON_SERVICE_PROCESS_UTIL_H_
 #define CHROME_COMMON_SERVICE_PROCESS_UTIL_H_
 
 #include <memory>
 #include <string>
 
 #include "base/callback_forward.h"
-#include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory.h"
 #include "base/process/process.h"
-#include "base/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "mojo/edk/embedder/named_platform_handle.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 
 class MultiProcessLock;
 
 #if defined(OS_MACOSX)
 #ifdef __OBJC__
 @class NSString;
 #else
 class NSString;
 #endif
 #endif
 
 namespace base {
 class CommandLine;
+class SingleThreadTaskRunner;
 }
 
 // Return the IPC channel to connect to the service process.
 mojo::edk::NamedPlatformHandle GetServiceProcessChannel();
 
 // Return a name that is scoped to this instance of the service process. We
 // use the user-data-dir as a scoping prefix.
 std::string GetServiceProcessScopedName(const std::string& append_str);
 
 #if !defined(OS_MACOSX)
@@ skipping 43 matching lines @@
   // Tries to become the sole service process for the current user data dir.
   // Returns false if another service process is already running.
   bool Initialize();
 
   // Signal that the service process is ready.
   // This method is called when the service process is running and initialized.
   // |terminate_task| is invoked when we get a terminate request from another
   // process (in the same thread that called SignalReady). It can be NULL.
   // |task_runner| must be of type IO and is the loop that POSIX uses
   // to monitor the service process.
-  bool SignalReady(scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+  bool SignalReady(base::SingleThreadTaskRunner* task_runner,
                    const base::Closure& terminate_task);
 
   // Signal that the service process is stopped.
   void SignalStopped();
 
   // Register the service process to run on startup.
   bool AddToAutoRun();
 
   // Unregister the service process to run on startup.
   bool RemoveFromAutoRun();
@@ skipping 27 matching lines @@
 
   // An opaque object that maintains state. The actual definition of this is
   // platform dependent.
   struct StateData;
   StateData* state_;
   std::unique_ptr<base::SharedMemory> shared_mem_service_data_;
   std::unique_ptr<base::CommandLine> autorun_command_line_;
 };
 
 #endif  // CHROME_COMMON_SERVICE_PROCESS_UTIL_H_