Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8807)

Unified Diff: chrome_frame/test/perf/chrome_frame_perftest.cc

Issue 6306004: More ChromeFrame perf test fixes to account for the changes in the UITest fun... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome_frame/test/perf/run_all.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/perf/chrome_frame_perftest.cc
===================================================================
--- chrome_frame/test/perf/chrome_frame_perftest.cc (revision 71693)
+++ chrome_frame/test/perf/chrome_frame_perftest.cc (working copy)
@@ -658,10 +658,20 @@
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);
}
@@ -670,7 +680,7 @@
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());
@@ -824,7 +834,7 @@
// 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());
« no previous file with comments | « no previous file | chrome_frame/test/perf/run_all.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698