Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / installer / setup / uninstall.cc

diff --git a/src/chrome/installer/setup/uninstall.cc b/src/chrome/installer/setup/uninstall.cc
index ce02a20..0d8293f 100644 (file)
--- a/src/chrome/installer/setup/uninstall.cc
+++ b/src/chrome/installer/setup/uninstall.cc
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "base/base_paths.h"
-#include "base/file_util.h"
 #include "base/files/file_enumerator.h"
+#include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/process/kill.h"
 #include "base/strings/string16.h"
@@ -282,13 +282,13 @@ void CloseChromeFrameHelperProcess() {
   ::GetWindowThreadProcessId(window, &pid);
   DCHECK_NE(pid, 0U);
   base::win::ScopedHandle process(::OpenProcess(SYNCHRONIZE, FALSE, pid));
-  PLOG_IF(INFO, !process) << "Failed to open process: " << pid;
+  PLOG_IF(INFO, !process.IsValid()) << "Failed to open process: " << pid;
 
   bool kill = true;
   if (SendMessageTimeout(window, WM_CLOSE, 0, 0, SMTO_BLOCK, kWaitMs, NULL) &&
-      process) {
+      process.IsValid()) {
     VLOG(1) << "Waiting for " << installer::kChromeFrameHelperExe;
-    DWORD wait = ::WaitForSingleObject(process, kWaitMs);
+    DWORD wait = ::WaitForSingleObject(process.Get(), kWaitMs);
     if (wait != WAIT_OBJECT_0) {
       LOG(WARNING) << "Wait for " << installer::kChromeFrameHelperExe
                    << " to exit failed or timed out.";