More ChromeFrame perf test fixes to account for the changes in the UITest fun...

chrome_frame/test/perf/chrome_frame_perftest.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_frame/test/perf/chrome_frame_perftest.h"
 
 #include <atlwin.h>
 #include <atlhost.h>
 #include <map>
 #include <vector>
 #include <string>
@@ skipping 640 matching lines @@
     size_t commit_size = (end_commit_charge - start_commit_charge_) * 1024;
 
     std::string trace_name(test_name);
     trace_name.append("_cc");
 
     PrintResult("commit_charge", "", trace_name,
                 commit_size / 1024, "KB", true /* important */);
     printf("\n");
   }
 
+  base::ProcessId chrome_browser_process_id() {
+    base::NamedProcessIterator iter(L"chrome.exe", NULL);
+    const base::ProcessEntry* entry = iter.NextProcessEntry();
+    if (entry) {
+      return entry->pid();
+    }
+    return -1;
+  }
+
   ChromeProcessList GetBrowserChildren() {
-    ChromeProcessList list = GetRunningChromeProcesses(browser_process_id());
+    ChromeProcessList list = GetRunningChromeProcesses(
+        chrome_browser_process_id());
     ChromeProcessList::iterator browser =
-        std::find(list.begin(), list.end(), browser_process_id());
+        std::find(list.begin(), list.end(), chrome_browser_process_id());
     if (browser != list.end()) {
       list.erase(browser);
     }
     return list;
   }
 
   void AccountProcessMemoryUsage(DWORD process_id) {
     ProcessMemoryInfo process_memory_info(
-        process_id, process_id == browser_process_id(), this);
+        process_id, process_id == chrome_browser_process_id(), this);
 
     ASSERT_TRUE(process_memory_info.GetMemoryConsumptionDetails());
 
     memory_consumption_map_[process_id] = process_memory_info;
   }
 
   void PrintMemoryUsageInfo(const char* test_name) {
     printf("\n");
 
     std::string trace_name(test_name);
@@ skipping 133 matching lines @@
     ASSERT_TRUE(chrome_frame_container_ != NULL);
     ASSERT_TRUE(!url.empty());
     chrome_frame_container_->Navigate(url.c_str());
   }
 
   void TestCompleted() {
     // This can get called multiple times if the last url results in a
     // redirect.
     if (!test_completed_) {
       // Measure memory usage for the browser process.
-      AccountProcessMemoryUsage(browser_process_id());
+      AccountProcessMemoryUsage(chrome_browser_process_id());
       // Measure memory usage for the current process.
       AccountProcessMemoryUsage(GetCurrentProcessId());
 
       test_completed_ = true;
       EXPECT_TRUE(PostMessage(static_cast<HWND>(*chrome_frame_container_),
                               WM_CLOSE, 0, 0));
     }
   }
 
  protected:
@@ skipping 619 matching lines @@
   PrintPerfTestResults(automation_provider_connect_monitor, kNumCycles,
                        "automationproviderconnect");
   PrintPerfTestResults(external_tab_navigate_monitor, kNumCycles,
                        "externaltabnavigate");
   PrintPerfTestResults(renderer_main_monitor, kNumCycles,
                        "beginrenderermain");
 #ifdef NDEBUG
   PrintPerfTestResults(pre_read_chrome_monitor, kNumCycles, "PreReadImage");
 #endif  // NDEBUG
 }