Switch to 4-space indent in chrome/test/mini_installer.

Bug: 784301
Change-Id: Ia7c2cadf1670a60665b6823404eb77e532335289
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2784897
Auto-Submit: Greg Thompson <grt@chromium.org>
Reviewed-by: Yann Dago <ydago@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#868107}

chrome/test/mini_installer/.style.yapf

@@ -1,3 +1,2 @@
 [style]
 based_on_style = pep8
-indent_width = 2

chrome/test/mini_installer/PRESUBMIT.py

@@ -9,12 +9,12 @@
 
 
 def CommonChecks(input_api, output_api):
-  return input_api.canned_checks.RunPylint(input_api, output_api)
+    return input_api.canned_checks.RunPylint(input_api, output_api)
 
 
 def CheckChangeOnUpload(input_api, output_api):
-  return CommonChecks(input_api, output_api)
+    return CommonChecks(input_api, output_api)
 
 
 def CheckChangeOnCommit(input_api, output_api):
-  return CommonChecks(input_api, output_api)
+    return CommonChecks(input_api, output_api)

chrome/test/mini_installer/chrome_helper.py

@@ -1,7 +1,6 @@
 # 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 logging
@@ -13,141 +12,150 @@
 
 
 def get_process_name(p):
-  """A wrapper to return a psutil.Process name."""
-  # Process.name was a property prior to version 2.0.
-  if psutil.version_info[0] < 2:
-    return p.name
-  # But it's a function since 2.0.
-  return p.name()
+    """A wrapper to return a psutil.Process name."""
+    # Process.name was a property prior to version 2.0.
+    if psutil.version_info[0] < 2:
+        return p.name
+    # But it's a function since 2.0.
+    return p.name()
 
 
 def get_process_exe(p):
-  """A wrapper to return a psutil.Process exe."""
-  # Process.exe was a property prior to version 2.0.
-  if psutil.version_info[0] < 2:
-    return p.exe
-  # But it's a function since 2.0.
-  return p.exe()
+    """A wrapper to return a psutil.Process exe."""
+    # Process.exe was a property prior to version 2.0.
+    if psutil.version_info[0] < 2:
+        return p.exe
+    # But it's a function since 2.0.
+    return p.exe()
 
 
 def get_process_ppid(p):
-  """A wrapper to return a psutil.Process ppid."""
-  # Process.ppid was a property prior to version 2.0.
-  if psutil.version_info[0] < 2:
-    return p.ppid
-  # But it's a function since 2.0.
-  return p.ppid()
+    """A wrapper to return a psutil.Process ppid."""
+    # Process.ppid was a property prior to version 2.0.
+    if psutil.version_info[0] < 2:
+        return p.ppid
+    # But it's a function since 2.0.
+    return p.ppid()
 
 
 def GetProcessIDAndPathPairs():
-  """Returns a list of 2-tuples of (process id, process path).
-  """
-  process_id_and_path_pairs = []
-  for process in psutil.process_iter():
-    try:
-      process_id_and_path_pairs.append((process.pid, get_process_exe(process)))
-    except psutil.Error:
-      # It's normal that some processes are not accessible.
-      pass
-  return process_id_and_path_pairs
+    """Returns a list of 2-tuples of (process id, process path).
+    """
+    process_id_and_path_pairs = []
+    for process in psutil.process_iter():
+        try:
+            process_id_and_path_pairs.append(
+                (process.pid, get_process_exe(process)))
+        except psutil.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|.
+    """Returns a list of IDs of processes whose path is |process_path|.
 
-  Args:
-    process_path: The path to the process.
+    Args:
+        process_path: The path to the process.
 
-  Returns:
-    A list of process IDs.
-  """
-  return [pid for (pid, path) in GetProcessIDAndPathPairs() if
-          path == process_path]
+    Returns:
+        A list of process IDs.
+    """
+    return [
+        pid for (pid, path) in GetProcessIDAndPathPairs()
+        if path == process_path
+    ]
 
 
 def WaitForChromeExit(chrome_path):
-  """Waits for all |chrome_path| processes to exit.
-
-  Args:
-    chrome_path: The path to the chrome.exe on which to wait.
-  """
-  def GetChromeProcesses(chrome_path):
-    """Returns a dict of all |chrome_path| processes indexed by pid."""
-    chrome_processes = dict()
-    for process in psutil.process_iter():
-      try:
-        if get_process_exe(process) == chrome_path:
-          chrome_processes[process.pid] = process
-          logging.info('Found chrome process %s' % get_process_exe(process))
-        elif get_process_name(process) == os.path.basename(chrome_path):
-          raise Exception(
-              'Found other chrome process %s' % get_process_exe(process))
-      except psutil.Error:
-        pass
-    return chrome_processes
-
-  def GetBrowserProcess(chrome_processes):
-    """Returns a psutil.Process for the browser process in |chrome_processes|.
+    """Waits for all |chrome_path| processes to exit.
+
+    Args:
+        chrome_path: The path to the chrome.exe on which to wait.
     """
-    # Find the one whose parent isn't a chrome.exe process.
-    for process in chrome_processes.itervalues():
-      try:
-        if get_process_ppid(process) not in chrome_processes:
-          return process
-      except psutil.Error:
-        pass
-    return None
-
-  chrome_processes = GetChromeProcesses(chrome_path)
-  while chrome_processes:
-    # Prefer waiting on the browser process.
-    process = GetBrowserProcess(chrome_processes)
-    if not process:
-      # Pick any process to wait on if no top-level parent was found.
-      process = next(chrome_processes.itervalues())
-    if process.is_running():
-      logging.info(
-        'Waiting on %s for %s %s processes to exit' %
-        (str(process), len(chrome_processes), get_process_exe(process)))
-      process.wait()
-    # Check for stragglers and keep waiting until all are gone.
+
+    def GetChromeProcesses(chrome_path):
+        """Returns a dict of all |chrome_path| processes indexed by pid."""
+        chrome_processes = dict()
+        for process in psutil.process_iter():
+            try:
+                if get_process_exe(process) == chrome_path:
+                    chrome_processes[process.pid] = process
+                    logging.info('Found chrome process %s' %
+                                 get_process_exe(process))
+                elif get_process_name(process) == os.path.basename(
+                        chrome_path):
+                    raise Exception('Found other chrome process %s' %
+                                    get_process_exe(process))
+            except psutil.Error:
+                pass
+        return chrome_processes
+
+    def GetBrowserProcess(chrome_processes):
+        """Returns a psutil.Process for the browser process in
+        |chrome_processes|.
+        """
+        # Find the one whose parent isn't a chrome.exe process.
+        for process in chrome_processes.itervalues():
+            try:
+                if get_process_ppid(process) not in chrome_processes:
+                    return process
+            except psutil.Error:
+                pass
+        return None
+
     chrome_processes = GetChromeProcesses(chrome_path)
+    while chrome_processes:
+        # Prefer waiting on the browser process.
+        process = GetBrowserProcess(chrome_processes)
+        if not process:
+            # Pick any process to wait on if no top-level parent was found.
+            process = next(chrome_processes.itervalues())
+        if process.is_running():
+            logging.info('Waiting on %s for %s %s processes to exit' %
+                         (str(process), len(chrome_processes),
+                          get_process_exe(process)))
+            process.wait()
+        # Check for stragglers and keep waiting until all are gone.
+        chrome_processes = GetChromeProcesses(chrome_path)
 
 
 def GetWindowHandles(process_ids):
-  """Returns a list of handles of windows owned by processes in |process_ids|.
+    """Returns a list of handles of windows owned by processes in |process_ids|.
 
-  Args:
-    process_ids: A list of process IDs.
+    Args:
+        process_ids: A list of process IDs.
 
-  Returns:
-    A list of handles of windows owned by processes in |process_ids|.
-  """
-  hwnds = []
-  def EnumerateWindowCallback(hwnd, _):
-    _, found_process_id = win32process.GetWindowThreadProcessId(hwnd)
-    if found_process_id in process_ids and win32gui.IsWindowVisible(hwnd):
-      hwnds.append(hwnd)
-  # Enumerate all the top-level windows and call the callback with the hwnd as
-  # the first parameter.
-  win32gui.EnumWindows(EnumerateWindowCallback, None)
-  return hwnds
+    Returns:
+        A list of handles of windows owned by processes in |process_ids|.
+    """
+    hwnds = []
+
+    def EnumerateWindowCallback(hwnd, _):
+        _, found_process_id = win32process.GetWindowThreadProcessId(hwnd)
+        if found_process_id in process_ids and win32gui.IsWindowVisible(hwnd):
+            hwnds.append(hwnd)
+
+    # Enumerate all the top-level windows and call the callback with the hwnd as
+    # the first parameter.
+    win32gui.EnumWindows(EnumerateWindowCallback, None)
+    return hwnds
 
 
 def WindowExists(process_ids, class_pattern):
-  """Returns whether there exists a window with the specified criteria.
-
-  This method returns whether there exists a window that is owned by a process
-  in |process_ids| and has a class name that matches |class_pattern|.
-
-  Args:
-    process_ids: A list of process IDs.
-    class_pattern: The regular expression pattern of the window class name.
-
-  Returns:
-    A boolean indicating whether such window exists.
-  """
-  for hwnd in GetWindowHandles(process_ids):
-    if re.match(class_pattern, win32gui.GetClassName(hwnd)):
-      return True
-  return False
+    """Returns whether there exists a window with the specified criteria.
+
+    This method returns whether there exists a window that is owned by a process
+    in |process_ids| and has a class name that matches |class_pattern|.
+
+    Args:
+        process_ids: A list of process IDs.
+        class_pattern: The regular expression pattern of the window class name.
+
+    Returns:
+        A boolean indicating whether such window exists.
+    """
+    for hwnd in GetWindowHandles(process_ids):
+        if re.match(class_pattern, win32gui.GetClassName(hwnd)):
+            return True
+    return False