| Index: tools/chrome_remote_control/chrome_remote_control/android_browser_finder.py
|
| diff --git a/tools/chrome_remote_control/chrome_remote_control/android_browser_finder.py b/tools/chrome_remote_control/chrome_remote_control/android_browser_finder.py
|
| index eeb0e2aa319956ff807233edb6275b425ea66e09..5508fabf4e34b9a7849f65d2b44d1635cd75e948 100644
|
| --- a/tools/chrome_remote_control/chrome_remote_control/android_browser_finder.py
|
| +++ b/tools/chrome_remote_control/chrome_remote_control/android_browser_finder.py
|
| @@ -1,13 +1,13 @@
|
| # Copyright (c) 2012 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.
|
| -import os as real_os
|
| -import subprocess as real_subprocess
|
| +import os
|
| import logging
|
| import re
|
| +import subprocess
|
|
|
| +from chrome_remote_control import adb_commands
|
| from chrome_remote_control import android_browser_backend
|
| -import chrome_remote_control.adb_commands as real_adb_commands
|
| from chrome_remote_control import browser
|
| from chrome_remote_control import possible_browser
|
|
|
| @@ -55,16 +55,14 @@ class PossibleAndroidBrowser(possible_browser.PossibleBrowser):
|
| self._options, *self._args)
|
| return browser.Browser(backend)
|
|
|
| -def FindAllAvailableBrowsers(options,
|
| - subprocess=real_subprocess,
|
| - adb_commands=real_adb_commands):
|
| +def FindAllAvailableBrowsers(options):
|
| """Finds all the desktop browsers available on this machine."""
|
| if not adb_commands.IsAndroidSupported():
|
| return []
|
|
|
| # See if adb even works.
|
| try:
|
| - with open(real_os.devnull, 'w') as devnull:
|
| + with open(os.devnull, 'w') as devnull:
|
| proc = subprocess.Popen(['adb', 'devices'],
|
| stdout=subprocess.PIPE,
|
| stderr=subprocess.PIPE,
|
|
|