Replace chrome_process_filter with chrome_process_util.

chrome/test/ui/ui_test.cc

 // Copyright (c) 2006-2008 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/test/ui/ui_test.h"
 
 #include <set>
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/test_file_util.h"
 #include "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/debug_flags.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
+#include "chrome/test/chrome_process_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 
 #if defined(OS_WIN)
-// TODO(port): these just need to be ported.
-#include "chrome/common/chrome_process_filter.h"
+// TODO(port): this just needs to be ported.
 #include "chrome/test/automation/window_proxy.h"
 #endif
 
 using base::TimeTicks;
 
 // Delay to let browser complete a requested action.
 static const int kWaitForActionMsec = 2000;
 static const int kWaitForActionMaxMsec = 10000;
 // Delay to let the browser complete the test.
 static const int kMaxTestExecutionTime = 30000;
@@ skipping 391 matching lines @@
 
   // Don't forget to close the handle
   base::CloseProcessHandle(process_);
   process_ = NULL;
 }
 
 void UITest::AssertAppNotRunning(const std::wstring& error_message) {
 #if defined(OS_WIN)
   ASSERT_EQ(0, GetBrowserProcessCount()) << error_message;
 #else
-  // TODO(port): Enable when chrome_process_filter is ported.
+  // TODO(port): Enable when chrome_process_util is ported.
   NOTIMPLEMENTED();
 #endif
 }
 
 void UITest::CleanupAppProcesses() {
 #if defined(OS_WIN)
-  BrowserProcessFilter filter(L"");
-
-  // Make sure that no instances of the browser remain.
-  const int kExitTimeoutMs = 5000;
-  const int kExitCode = 1;
-  base::CleanupProcesses(
-      chrome::kBrowserProcessExecutableName, kExitTimeoutMs, kExitCode,
-      &filter);
+  TerminateAllChromeProcesses(FilePath::FromWStringHack(user_data_dir()));
 
   // Suppress spammy failures that seem to be occurring when running
   // the UI tests in single-process mode.
   // TODO(jhughes): figure out why this is necessary at all, and fix it
-  if (!in_process_renderer_) {
+  if (!in_process_renderer_)
     AssertAppNotRunning(L"Unable to quit all browser processes.");
-  }
 #else
-  // TODO(port): depends on BrowserProcessFilter.
+  // TODO(port): depends on chrome_process_util.
   NOTIMPLEMENTED();
 #endif
 }
 
 TabProxy* UITest::GetActiveTab() {
   scoped_ptr<BrowserProxy> window_proxy(automation()->GetBrowserWindow(0));
   if (!window_proxy.get())
     return NULL;
 
   int active_tab_index = -1;
@@ skipping 101 matching lines @@
 
 bool UITest::IsBrowserRunning() {
   return CrashAwareSleep(0);
 }
 
 bool UITest::CrashAwareSleep(int time_out_ms) {
   return base::CrashAwareSleep(process_, time_out_ms);
 }
 
 #if defined(OS_WIN)
-// TODO(port): Port BrowserProcessFilter and sort out one wstring/string issue.
+// TODO(port): Port GetRunningChromeProcesses and sort out one w/string issue.
 
 /*static*/
 int UITest::GetBrowserProcessCount() {
-  BrowserProcessFilter filter(L"");
-  return base::GetProcessCount(chrome::kBrowserProcessExecutableName,
-                               &filter);
+  FilePath data_dir;
+  PathService::Get(chrome::DIR_USER_DATA, &data_dir);
+  return GetRunningChromeProcesses(data_dir).size();
 }
 
 static DictionaryValue* LoadDictionaryValueFromPath(const FilePath& path) {
   if (path.empty())
     return NULL;
 
   JSONFileValueSerializer serializer(path);
   scoped_ptr<Value> root_value(serializer.Deserialize(NULL));
   if (!root_value.get() || root_value->GetType() != Value::TYPE_DICTIONARY)
     return NULL;
@@ skipping 252 matching lines @@
 }
 
 bool UITest::EvictFileFromSystemCacheWrapper(const FilePath& path) {
   for (int i = 0; i < 10; i++) {
     if (file_util::EvictFileFromSystemCache(path))
       return true;
     PlatformThread::Sleep(1000);
   }
   return false;
 }