Telemetry: fixes SurfaceStatsCollector usage.

tools/telemetry/telemetry/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
@@ skipping 12 matching lines @@
 }
 
 ALL_BROWSER_TYPES = ','.join(['android-content-shell'] +
                              CHROME_PACKAGE_NAMES.keys())
 
 CHROME_ACTIVITY = 'com.google.android.apps.chrome.Main'
 CHROME_COMMAND_LINE = '/data/local/chrome-command-line'
 CHROME_DEVTOOLS_REMOTE_PORT = 'localabstract:chrome_devtools_remote'
 
 CONTENT_SHELL_PACKAGE = 'org.chromium.content_shell'
-CONTENT_SHELL_ACTIVITY = '.ContentShellActivity'
+CONTENT_SHELL_ACTIVITY = 'org.chromium.content_shell.ContentShellActivity'
 CONTENT_SHELL_COMMAND_LINE = '/data/local/tmp/content-shell-command-line'
 CONTENT_SHELL_DEVTOOLS_REMOTE_PORT = (
     'localabstract:content_shell_devtools_remote')
 
 # adb shell pm list packages
 # adb
 # intents to run (pass -D url for the rest)
 #   com.android.chrome/.Main
 #   com.google.android.apps.chrome/.Main
 
 class PossibleAndroidBrowser(possible_browser.PossibleBrowser):
   """A launchable android browser instance."""
   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(
         self._args[0].Adb(), self._args[1],
-        self._args[1] + self._args[4])
+        self._args[4])
     b = browser.Browser(backend, platform)
     backend.SetBrowser(b)
     return b
 
 def FindAllAvailableBrowsers(options, logging=real_logging):
   """Finds all the desktop browsers available on this machine."""
   if not adb_commands.IsAndroidSupported():
     return []
 
   # See if adb even works.
@@ skipping 67 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