Remove psutil from the mini_installer test framework.

chrome/test/mini_installer/chrome_helper.py

 # Copyright 2013 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.
 
 """Common helper module for working with Chrome's processes and windows."""
 
-import psutil
+import ctypes
+import pywintypes
 import re
+import win32con
 import win32gui
 import win32process
 
 import path_resolver
 
 
+def GetProcessIDAndPathPairs():
+  """Returns a list of 2-tuples of (process id, process path).
+
+  This is needed because psutil is not available on Windows slave machines (see
+  https://code.google.com/p/chromium/issues/detail?id=257696). When it becomes

[Mathieu, 2013/08/30 19:34:10]

How about:

This is needed because psutil is not available on Windows slave machines (see:
http://crbug.com/257696).
TODO(sukolsak): Use psutil.process_iter() once it becomes available.

[sukolsak, 2013/08/30 20:06:07]

Done.

+  available, we can use psutil.process_iter() instead.
+  """
+  process_id_and_path_pairs = []
+  for process_id in win32process.EnumProcesses():
+    process_handle = ctypes.windll.kernel32.OpenProcess(

[Mathieu, 2013/08/30 19:34:10]

Make sure this never produces an exception

[sukolsak, 2013/08/30 20:06:07]

OpenProcess doesn't produce an exception. It returns NULL when it fails.

[Mathieu, 2013/08/30 20:11:15]

Do you mean None or the string 'NULL'? Verify that it does what you expect it to
do (that is, not add it to process_id_and_path_pairs)

[sukolsak, 2013/08/30 20:22:02]

Sorry, I mean 0 (int). I have verified it with "print type(process_handle)". It
does what I expect it to do.

+        win32con.PROCESS_QUERY_INFORMATION | win32con.PROCESS_VM_READ, False,
+        process_id)
+    if not process_handle:
+      continue
+    try:
+      process_path = win32process.GetModuleFileNameEx(process_handle, 0)
+      process_id_and_path_pairs.append((process_id, process_path))
+    except pywintypes.error:
+      # It's normal that some processes are not accessible.
+      pass
+  return process_id_and_path_pairs
+
+
 def GetProcessIDs(process_path):
   """Returns a list of IDs of processes whose path is |process_path|.
 
   Args:
     process_path: The path to the process.
 
   Returns:
     A list of process IDs.
   """
   process_ids = []
-  for process in psutil.process_iter():
-    try:
-      found_process_path = process.exe
-      if found_process_path == process_path:
-        process_ids.append(process.pid)
-    except psutil.AccessDenied:
-      # It's normal that some processes are not accessible.
-      pass
+  for found_process_id, found_process_path in GetProcessIDAndPathPairs():
+    if found_process_path == process_path:
+      process_ids.append(found_process_id)
   return process_ids

[Mathieu, 2013/08/30 19:34:10]

How about:
return [pid for (pid, path) in GetProcessIDAndPathPairs() if
        path == process_path]

[sukolsak, 2013/08/30 20:06:07]

Done.

 
 
 def GetWindowHandles(process_ids):
   """Returns a list of handles of windows owned by processes in |process_ids|.
 
   Args:
     process_ids: A list of process IDs.
 
   Returns:
     A list of handles of windows owned by processes in |process_ids|.
@@ skipping 29 matching lines @@
 
 
 def GetChromePath(system_level):
   """Returns the path to Chrome, at the |system_level| or user level."""
   chrome_path = None
   if system_level:
     chrome_path = '$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe'
   else:
     chrome_path = '$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe'
   return path_resolver.ResolvePath(chrome_path)