Replace chrome_process_filter with chrome_process_util.

chrome/test/page_cycler/page_cycler_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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
-#if defined(OS_WIN)
-// TODO(port): Enable when chrome_process_filter.h is ported.
-#include "chrome/common/chrome_process_filter.h"
-#endif  // defined(OS_WIN)
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
+#include "chrome/test/chrome_process_util.h"
 #include "chrome/test/ui/ui_test.h"
 #include "chrome/test/perf/mem_usage.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 
 #ifndef NDEBUG
 #define TEST_ITERATIONS "2"
 #else
 #define TEST_ITERATIONS "10"
 #endif
@@ skipping 50 matching lines @@
     std::string cookie;
     ASSERT_TRUE(tab->GetCookieByName(test_url, "__pc_pages", &cookie));
     pages->assign(UTF8ToWide(cookie));
     ASSERT_FALSE(pages->empty());
     ASSERT_TRUE(tab->GetCookieByName(test_url, "__pc_timings", &cookie));
     timings->assign(cookie);
     ASSERT_FALSE(timings->empty());
   }
 
 #if defined(OS_WIN)
-  // TODO(port): Code below depends on BrowserProcessFilter and has windowsisms.
+  // TODO(port): Port chrome_process_util and remove windowsisms.
   void PrintIOPerfInfo(const char* test_name) {
-    BrowserProcessFilter chrome_filter(L"");
-    base::NamedProcessIterator
-        chrome_process_itr(chrome::kBrowserProcessExecutableName,
-                           &chrome_filter);
+    FilePath data_dir;
+    PathService::Get(chrome::DIR_USER_DATA, &data_dir);
+    int browser_process_pid = ChromeBrowserProcessId(data_dir);
+    ChromeProcessList chrome_processes(GetRunningChromeProcesses(data_dir));
 
-    const PROCESSENTRY32* chrome_entry;
-    while(chrome_entry = chrome_process_itr.NextProcessEntry()) {
-      uint32 pid = chrome_entry->th32ProcessID;
-      HANDLE process_handle = OpenProcess(PROCESS_QUERY_INFORMATION,
-                                          false,
-                                          pid);
+    ChromeProcessList::const_iterator it;
+    for (it = chrome_processes.begin(); it != chrome_processes.end(); ++it) {
+      base::ProcessHandle process_handle;
+      if (!base::OpenProcessHandle(*it, &process_handle)) {
+        NOTREACHED();
+      }
 
       scoped_ptr<base::ProcessMetrics> process_metrics;
       IO_COUNTERS io_counters;
       process_metrics.reset(
           base::ProcessMetrics::CreateProcessMetrics(process_handle));
       ZeroMemory(&io_counters, sizeof(io_counters));
 
       if (process_metrics.get()->GetIOCounters(&io_counters)) {
         // Print out IO performance.  We assume that the values can be
         // converted to size_t (they're reported as ULONGLONG, 64-bit numbers).
-        std::string chrome_name =
-            (pid == chrome_filter.browser_process_id()) ? "_b" : "_r";
+        std::string chrome_name = (*it == browser_process_pid) ? "_b" : "_r";
 
         PrintResult("read_op", chrome_name,
                     "r_op" + chrome_name + test_name,
                     static_cast<size_t>(io_counters.ReadOperationCount), "",
                     false /* not important */);
         PrintResult("write_op", chrome_name,
                     "w_op" + chrome_name + test_name,
                     static_cast<size_t>(io_counters.WriteOperationCount), "",
                     false /* not important */);
         PrintResult("other_op", chrome_name,
@@ skipping 23 matching lines @@
 
         total = static_cast<size_t>((io_counters.ReadTransferCount +
                                      io_counters.WriteTransferCount +
                                      io_counters.OtherTransferCount) / 1024);
         PrintResult("total_byte", chrome_name,
                     "IO_b" + chrome_name + test_name,
                     total, "kb", true /* important */);
 
 
       }
+
+      base::CloseProcessHandle(process_handle);
     }
   }
 
   void PrintMemoryUsageInfo(const char* test_name) {
-    BrowserProcessFilter chrome_filter(L"");
-    base::NamedProcessIterator
-        chrome_process_itr(chrome::kBrowserProcessExecutableName,
-                           &chrome_filter);
+    FilePath data_dir;
+    PathService::Get(chrome::DIR_USER_DATA, &data_dir);
+    int browser_process_pid = ChromeBrowserProcessId(data_dir);
+    ChromeProcessList chrome_processes(GetRunningChromeProcesses(data_dir));
 
-    const PROCESSENTRY32* chrome_entry;
-    while(chrome_entry = chrome_process_itr.NextProcessEntry()) {
-      uint32 pid = chrome_entry->th32ProcessID;
+    ChromeProcessList::const_iterator it;
+    for (it = chrome_processes.begin(); it != chrome_processes.end(); ++it) {
       size_t peak_virtual_size;
       size_t current_virtual_size;
       size_t peak_working_set_size;
       size_t current_working_set_size;
-      if (GetMemoryInfo(pid, &peak_virtual_size, &current_virtual_size,
+      if (GetMemoryInfo(*it, &peak_virtual_size, &current_virtual_size,
                         &peak_working_set_size, &current_working_set_size)) {
 
-        std::string chrome_name =
-            (pid == chrome_filter.browser_process_id()) ? "_b" : "_r";
+        std::string chrome_name = (*it == browser_process_pid) ? "_b" : "_r";
 
         std::string trace_name(test_name);
         PrintResult("vm_peak", chrome_name,
                     "vm_pk" + chrome_name + trace_name,
                     peak_virtual_size, "bytes",
                     true /* important */);
         PrintResult("vm_final", chrome_name,
                     "vm_f" + chrome_name + trace_name,
                     current_virtual_size, "bytes",
                     false /* not important */);
@@ skipping 140 matching lines @@
   RunTest("dom", true);
 }
 
 TEST_F(PageCyclerTest, BloatHttp) {
   RunTest("bloat", true);
 }
 
 TEST_F(PageCyclerReferenceTest, BloatHttp) {
   RunTest("bloat", true);
 }