diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:52:40 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:52:40 +0000 |
| commit | 2fbc33967abe8fd301a1c0ce35a625ed98bf41f9 (patch) | |
| tree | 2993e976c8470926d9e7f46a1da099c6045eecde /chrome_frame/test/perf | |
| parent | b33f1d943fd420857d9c5988ce1f4598f9a8765a (diff) | |
| download | chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.zip chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.tar.gz chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.tar.bz2 | |
Revert "Another dependency the bbot missed!!!"
This reverts commit 161f7fd3bdd425167af9fe26fdc5373a2ff44c98.
Revert "Missed a file as part of checkin for r48186"
This reverts commit cff86beba5938209393a6c3bccced62a7f3ff36b.
Revert "Enable warning 4389 as an error on windows builds. This will make"
This reverts commit c78936bcfc65b98edf288191d927a495b0364621.
TBR=mbelshe
Review URL: http://codereview.chromium.org/2253001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/perf')
| -rw-r--r-- | chrome_frame/test/perf/chrome_frame_perftest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc index 4806865..a3d3b99 100644 --- a/chrome_frame/test/perf/chrome_frame_perftest.cc +++ b/chrome_frame/test/perf/chrome_frame_perftest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2009 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" @@ -508,7 +508,7 @@ class ChromeFrameMemoryTest : public ChromeFramePerfTestBase { chrome_frame_memory_test_instance_->PrintResult( "ws_final_browser", "", trace_name + "_ws_b", working_set_size_ / 1024, "KB", false /* not important */); - } else if (process_id_ == base::GetCurrentProcId()) { + } else if (process_id_ == GetCurrentProcessId()) { chrome_frame_memory_test_instance_->PrintResult( "vm_current_process", "", trace_name + "_vm_c", virtual_size_ / 1024, "KB", false /* not important */); @@ -520,7 +520,7 @@ class ChromeFrameMemoryTest : public ChromeFramePerfTestBase { printf("\n"); } - base::ProcessId process_id_; + int process_id_; size_t virtual_size_; size_t working_set_size_; // Set to true if this is the chrome browser process. |