Move the ProcessWatcher methods out of content/common/process_watcher into base/process_util, alo...

chrome/browser/ui/webui/options/advanced_options_utils_x11.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.
 
 #if !defined(OS_CHROMEOS)
 
 #include "chrome/browser/ui/webui/options/advanced_options_utils.h"
 
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/nix/xdg_util.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/process_watcher.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 // Command used to configure GNOME 2 proxy settings.
 const char* kGNOME2ProxyConfigCommand[] = {"gnome-network-properties", NULL};
 // In GNOME 3, we might need to run gnome-control-center instead. We try this
 // only after gnome-network-properties is not found, because older GNOME also
 // has this but it doesn't do the same thing. See below where we use it.
 const char* kGNOME3ProxyConfigCommand[] = {"gnome-control-center", "network",
@@ skipping 49 matching lines @@
   if (!found)
     return false;
   std::vector<std::string> argv;
   for (size_t i = 0; command[i]; ++i)
     argv.push_back(command[i]);
   base::ProcessHandle handle;
   if (!base::LaunchProcess(argv, base::LaunchOptions(), &handle)) {
     LOG(ERROR) << "StartProxyConfigUtil failed to start " << command[0];
     return false;
   }
-  ProcessWatcher::EnsureProcessGetsReaped(handle);
+  base::EnsureProcessGetsReaped(handle);
   return true;
 }
 
 // Detect, and if possible, start the appropriate proxy config utility. On
 // failure to do so, show the Linux proxy config URL in a new tab instead.
 void DetectAndStartProxyConfigUtil(TabContents* tab_contents) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
   bool launched = false;
@@ skipping 34 matching lines @@
 
 }  // anonymous namespace
 
 void AdvancedOptionsUtilities::ShowNetworkProxySettings(
     TabContents* tab_contents) {
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&DetectAndStartProxyConfigUtil, tab_contents));
 }
 
 #endif  // !defined(OS_CHROMEOS)