| Index: chrome/browser/memory_details_win.cc
|
| diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc
|
| index d49a852935380bd6f5950f3dd6e94223f1de4881..4684fd002c6c5d2116490898eb53bdc66c7bba96 100644
|
| --- a/chrome/browser/memory_details_win.cc
|
| +++ b/chrome/browser/memory_details_win.cc
|
| @@ -1,8 +1,9 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 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/browser/memory_details.h"
|
| +
|
| #include <psapi.h>
|
|
|
| #include "app/l10n_util.h"
|
| @@ -10,6 +11,7 @@
|
| #include "base/file_version_info.h"
|
| #include "base/string_util.h"
|
| #include "base/utf_string_conversions.h"
|
| +#include "base/win/scoped_handle.h"
|
| #include "chrome/browser/browser_child_process_host.h"
|
| #include "chrome/browser/browser_thread.h"
|
| #include "chrome/browser/renderer_host/backing_store_manager.h"
|
| @@ -74,7 +76,8 @@ void MemoryDetails::CollectProcessData(
|
| bool is_64bit_os =
|
| system_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64;
|
|
|
| - ScopedHandle snapshot(::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0));
|
| + base::win::ScopedHandle snapshot(
|
| + ::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0));
|
| PROCESSENTRY32 process_entry = {sizeof(PROCESSENTRY32)};
|
| if (!snapshot.Get()) {
|
| LOG(ERROR) << "CreateToolhelp32Snaphot failed: " << GetLastError();
|
| @@ -86,7 +89,7 @@ void MemoryDetails::CollectProcessData(
|
| }
|
| do {
|
| base::ProcessId pid = process_entry.th32ProcessID;
|
| - ScopedHandle handle(::OpenProcess(
|
| + base::win::ScopedHandle handle(::OpenProcess(
|
| PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid));
|
| if (!handle.Get())
|
| continue;
|
|
|