Refactor UITestBase/ProxyLauncher.

chrome/test/ui/ui_perf_test.cc

 // Copyright (c) 2010 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_perf_test.h"
 
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/chrome_process_util.h"
@@ skipping 49 matching lines @@
   // <*>RESULT <graph_name>: <trace_name>= <value> <units>
   // <*>RESULT <graph_name>: <trace_name>= {<mean>, <std deviation>} <units>
   // <*>RESULT <graph_name>: <trace_name>= [<value>,value,value,...,] <units>
   printf("%sRESULT %s%s: %s= %s%s%s %s\n",
          important ? "*" : "", measurement.c_str(), modifier.c_str(),
          trace.c_str(), prefix.c_str(), values.c_str(), suffix.c_str(),
          units.c_str());
 }
 
 void UIPerfTest::PrintIOPerfInfo(const char* test_name) {
-  ChromeProcessList chrome_processes(GetRunningChromeProcesses(process_id_));
+  ChromeProcessList chrome_processes(
+      GetRunningChromeProcesses(browser_process_id()));
 
   size_t read_op_b = 0;
   size_t read_op_r = 0;
   size_t write_op_b = 0;
   size_t write_op_r = 0;
   size_t other_op_b = 0;
   size_t other_op_r = 0;
   size_t total_op_b = 0;
   size_t total_op_r = 0;
 
@@ skipping 85 matching lines @@
   PrintResult("other_op_r", "", "o_op_r" + t_name, other_op_r, "", false);
   PrintResult("total_op_r", "", "IO_op_r" + t_name, total_op_r, "", true);
 
   PrintResult("read_byte_r", "", "r_r" + t_name, read_byte_r, "kb", false);
   PrintResult("write_byte_r", "", "w_r" + t_name, write_byte_r, "kb", false);
   PrintResult("other_byte_r", "", "o_r" + t_name, other_byte_r, "kb", false);
   PrintResult("total_byte_r", "", "IO_r" + t_name, total_byte_r, "kb", true);
 }
 
 void UIPerfTest::PrintMemoryUsageInfo(const char* test_name) {
-  ChromeProcessList chrome_processes(GetRunningChromeProcesses(process_id_));
+  ChromeProcessList chrome_processes(
+      GetRunningChromeProcesses(browser_process_id()));
 
   size_t browser_virtual_size = 0;
   size_t browser_working_set_size = 0;
   size_t renderer_virtual_size = 0;
   size_t renderer_working_set_size = 0;
   size_t total_virtual_size = 0;
   size_t total_working_set_size = 0;
 #if defined(OS_WIN)
   size_t browser_peak_virtual_size = 0;
   size_t browser_peak_working_set_size = 0;
@@ skipping 130 matching lines @@
   dir = dir.AppendASCII("reference_build");
 #if defined(OS_WIN)
   dir = dir.AppendASCII("chrome");
 #elif defined(OS_LINUX)
   dir = dir.AppendASCII("chrome_linux");
 #elif defined(OS_MACOSX)
   dir = dir.AppendASCII("chrome_mac");
 #endif
   SetBrowserDirectory(dir);
 }