Telemetry: extends Platform abstraction.

tools/telemetry/telemetry/core/chrome/android_browser_finder.py

 # 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.
 """Finds android browsers that can be controlled by telemetry."""
 
 import os
 import logging as real_logging
 import re
 import subprocess
 import sys
 
 from telemetry.core import browser
 from telemetry.core import possible_browser
 from telemetry.core.chrome import adb_commands
 from telemetry.core.chrome import android_browser_backend
-from telemetry.core.chrome import android_platform
+from telemetry.core.chrome import android_platform_backend
+from telemetry.core.chrome import platform
 
 CHROME_PACKAGE_NAMES = {
   'android-chrome': 'com.google.android.apps.chrome',
   'android-chrome-beta': 'com.chrome.beta',
   'android-chrome-dev': 'com.google.android.apps.chrome_dev',
   'android-jb-system-chrome': 'com.android.chrome'
 }
 
 ALL_BROWSER_TYPES = ','.join(['android-content-shell'] +
                              CHROME_PACKAGE_NAMES.keys())
@@ skipping 19 matching lines @@
   def __init__(self, browser_type, options, *args):
     super(PossibleAndroidBrowser, self).__init__(browser_type, options)
     self._args = args
 
   def __repr__(self):
     return 'PossibleAndroidBrowser(browser_type=%s)' % self.browser_type
 
   def Create(self):
     backend = android_browser_backend.AndroidBrowserBackend(
         self._options, *self._args)
-    platform = android_platform.AndroidPlatform(
+    platform_backend = android_platform_backend.AndroidPlatformBackend(
         self._args[0].Adb(), self._args[1],
         self._args[4])
-    b = browser.Browser(backend, platform)
+    b = browser.Browser(backend, platform.Platform(platform_backend))
     backend.SetBrowser(b)
     return b
 
   def SupportsOptions(self, options):
     if len(options.extensions_to_load) != 0:
       return False
     return True
 
 def FindAllAvailableBrowsers(options, logging=real_logging):
   """Finds all the desktop browsers available on this machine."""
@@ skipping 71 matching lines @@
   # but make it accessible to the device.
   if len(possible_browsers) and not adb_commands.HasForwarder():
     logging.warn('telemetry detected an android device. However,')
     logging.warn('Chrome\'s port-forwarder app is not available.')
     logging.warn('To build:')
     logging.warn('  make -j16 host_forwarder device_forwarder')
     logging.warn('')
     logging.warn('')
     return []
   return possible_browsers