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

chrome/service/service_process.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/service/service_process.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/base_switches.h"
@@ skipping 219 matching lines @@
 
   return true;
 }
 
 bool ServiceProcess::Teardown() {
   service_prefs_.reset();
   cloud_print_proxy_.reset();
 
   mojo_ipc_support_.reset();
   ipc_server_.reset();
-
-  // On POSIX, this must be called before joining |io_thread_| because it posts
-  // a DeleteSoon() task to that thread.
-  service_process_state_->SignalStopped();
-
   // Signal this event before shutting down the service process. That way all
   // background threads can cleanup.
   shutdown_event_.Signal();
   io_thread_.reset();
   file_thread_.reset();
 
   if (blocking_pool_.get()) {
     // The goal is to make it impossible for chrome to 'infinite loop' during
     // shutdown, but to reasonably expect that all BLOCKING_SHUTDOWN tasks
     // queued during shutdown get run. There's nothing particularly scientific
     // about the number chosen.
     const int kMaxNewShutdownBlockingTasks = 1000;
     blocking_pool_->Shutdown(kMaxNewShutdownBlockingTasks);
     blocking_pool_ = NULL;
   }
 
   // The NetworkChangeNotifier must be destroyed after all other threads that
   // might use it have been shut down.
   network_change_notifier_.reset();
 
+  service_process_state_->SignalStopped();
   return true;
 }
 
 // This method is called when a shutdown command is received from IPC channel
 // or there was an error in the IPC channel.
 void ServiceProcess::Shutdown() {
 #if defined(OS_MACOSX)
   // On MacOS X the service must be removed from the launchd job list.
   // http://www.chromium.org/developers/design-documents/service-processes
   // The best way to do that is to go through the ForceServiceProcessShutdown
@@ skipping 137 matching lines @@
     } else {
       Shutdown();
     }
   }
 }
 
 ServiceProcess::~ServiceProcess() {
   Teardown();
   g_service_process = NULL;
 }