summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 15:52:45 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 15:52:45 +0000
commita5a00b1dd7a4950de617bb9bb9bc596d1f89965f (patch)
treebfa6a819deb40647392a5b4db31d26e428eb0e37 /chrome/browser
parent152c76a49742732b72d061032979d5b27ca2af28 (diff)
downloadchromium_src-a5a00b1dd7a4950de617bb9bb9bc596d1f89965f.zip
chromium_src-a5a00b1dd7a4950de617bb9bb9bc596d1f89965f.tar.gz
chromium_src-a5a00b1dd7a4950de617bb9bb9bc596d1f89965f.tar.bz2
Move ProcessEntry and IoCounters inside namespace base.
TEST=none BUG=none Review URL: http://codereview.chromium.org/1599007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/memory_details_mac.cc14
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_database_bloom.cc4
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_database_unittest.cc4
3 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc
index fda205e..2b334e4 100644
--- a/chrome/browser/memory_details_mac.cc
+++ b/chrome/browser/memory_details_mac.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
@@ -104,9 +104,9 @@ void MemoryDetails::CollectProcessData(
base::NamedProcessIterator process_it(process_data_[index].process_name,
NULL);
- while (const ProcessEntry* process_entry = process_it.NextProcessEntry()) {
- pids_by_browser[index].push_back(process_entry->pid);
- all_pids.push_back(process_entry->pid);
+ while (const base::ProcessEntry* entry = process_it.NextProcessEntry()) {
+ pids_by_browser[index].push_back(entry->pid);
+ all_pids.push_back(entry->pid);
}
}
@@ -115,9 +115,9 @@ void MemoryDetails::CollectProcessData(
{
base::NamedProcessIterator helper_it(chrome::kHelperProcessExecutableName,
NULL);
- while (const ProcessEntry* process_entry = helper_it.NextProcessEntry()) {
- helper_pids.push_back(process_entry->pid);
- all_pids.push_back(process_entry->pid);
+ while (const base::ProcessEntry* entry = helper_it.NextProcessEntry()) {
+ helper_pids.push_back(entry->pid);
+ all_pids.push_back(entry->pid);
}
}
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc b/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc
index d1ceb37..6951e41 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
@@ -473,7 +473,7 @@ void SafeBrowsingDatabaseBloom::GetChunkIds(
void SafeBrowsingDatabaseBloom::BuildBloomFilter() {
#if defined(OS_WIN)
// For measuring the amount of IO during the bloom filter build.
- IoCounters io_before, io_after;
+ base::IoCounters io_before, io_after;
base::ProcessHandle handle = base::Process::Current().handle();
scoped_ptr<base::ProcessMetrics> metric;
metric.reset(base::ProcessMetrics::CreateProcessMetrics(handle));
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
index 84cbc80..ea4a7684 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
//
@@ -1024,7 +1024,7 @@ struct ChunksInfo {
void PerformUpdate(const FilePath& initial_db,
const std::vector<ChunksInfo>& chunks,
const std::vector<SBChunkDelete>& deletes) {
- IoCounters before, after;
+ base::IoCounters before, after;
FilePath path;
PathService::Get(base::DIR_TEMP, &path);