Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / memory_details_win.cc

diff --git a/src/chrome/browser/memory_details_win.cc b/src/chrome/browser/memory_details_win.cc
index b3a3a44..1b9ed4f 100644 (file)
--- a/src/chrome/browser/memory_details_win.cc
+++ b/src/chrome/browser/memory_details_win.cc
@@ -16,9 +16,9 @@
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/grit/chromium_strings.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/process_type.h"
-#include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
@@ -85,7 +85,7 @@ void MemoryDetails::CollectProcessData(
     LOG(ERROR) << "CreateToolhelp32Snaphot failed: " << GetLastError();
     return;
   }
-  if (!::Process32First(snapshot, &process_entry)) {
+  if (!::Process32First(snapshot.Get(), &process_entry)) {
     LOG(ERROR) << "Process32First failed: " << GetLastError();
     return;
   }
@@ -93,12 +93,12 @@ void MemoryDetails::CollectProcessData(
     base::ProcessId pid = process_entry.th32ProcessID;
     base::win::ScopedHandle process_handle(::OpenProcess(
         PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid));
-    if (!process_handle.Get())
+    if (!process_handle.IsValid())
       continue;
     bool is_64bit_process =
         ((windows_architecture == base::win::OSInfo::X64_ARCHITECTURE) ||
          (windows_architecture == base::win::OSInfo::IA64_ARCHITECTURE)) &&
-        (base::win::OSInfo::GetWOW64StatusForProcess(process_handle) ==
+        (base::win::OSInfo::GetWOW64StatusForProcess(process_handle.Get()) ==
             base::win::OSInfo::WOW64_DISABLED);
     for (unsigned int index2 = 0; index2 < process_data_.size(); index2++) {
       if (_wcsicmp(process_data_[index2].process_name.c_str(),
@@ -115,7 +115,8 @@ void MemoryDetails::CollectProcessData(
         info.process_type = content::PROCESS_TYPE_UNKNOWN;
 
       scoped_ptr<base::ProcessMetrics> metrics;
-      metrics.reset(base::ProcessMetrics::CreateProcessMetrics(process_handle));
+      metrics.reset(base::ProcessMetrics::CreateProcessMetrics(
+                        process_handle.Get()));
       metrics->GetCommittedKBytes(&info.committed);
       metrics->GetWorkingSetKBytes(&info.working_set);
 
@@ -134,7 +135,7 @@ void MemoryDetails::CollectProcessData(
           info.process_type = child_info[child].process_type;
           break;
         }
-      } else if (GetModuleFileNameEx(process_handle, NULL, name,
+      } else if (GetModuleFileNameEx(process_handle.Get(), NULL, name,
                                      MAX_PATH - 1)) {
         std::wstring str_name(name);
         scoped_ptr<FileVersionInfo> version_info(
@@ -154,7 +155,7 @@ void MemoryDetails::CollectProcessData(
       }
       break;
     }
-  } while (::Process32Next(snapshot, &process_entry));
+  } while (::Process32Next(snapshot.Get(), &process_entry));
 
   // Finally return to the browser thread.
   BrowserThread::PostTask(