| Index: tools/android/adb_profile_chrome/chrome_controller.py | 
| diff --git a/tools/android/adb_profile_chrome/chrome_controller.py b/tools/android/adb_profile_chrome/chrome_controller.py | 
| deleted file mode 100644 | 
| index e2ec85991bc1c65e8b046d876f38d618168cec96..0000000000000000000000000000000000000000 | 
| --- a/tools/android/adb_profile_chrome/chrome_controller.py | 
| +++ /dev/null | 
| @@ -1,102 +0,0 @@ | 
| -# Copyright 2014 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 json | 
| -import os | 
| -import re | 
| -import time | 
| - | 
| -from adb_profile_chrome import controllers | 
| - | 
| -from pylib import pexpect | 
| -from pylib.device import intent | 
| - | 
| -_HEAP_PROFILE_MMAP_PROPERTY = 'heapprof.mmap' | 
| - | 
| -class ChromeTracingController(controllers.BaseController): | 
| -  def __init__(self, device, package_info, | 
| -               categories, ring_buffer, trace_memory=False): | 
| -    controllers.BaseController.__init__(self) | 
| -    self._device = device | 
| -    self._package_info = package_info | 
| -    self._categories = categories | 
| -    self._ring_buffer = ring_buffer | 
| -    self._trace_file = None | 
| -    self._trace_interval = None | 
| -    self._trace_memory = trace_memory | 
| -    self._trace_start_re = \ | 
| -       re.compile(r'Logging performance trace to file') | 
| -    self._trace_finish_re = \ | 
| -       re.compile(r'Profiler finished[.] Results are in (.*)[.]') | 
| -    self._device.old_interface.StartMonitoringLogcat(clear=False) | 
| - | 
| -  def __repr__(self): | 
| -    return 'chrome trace' | 
| - | 
| -  @staticmethod | 
| -  def GetCategories(device, package_info): | 
| -    device.BroadcastIntent(intent.Intent( | 
| -        action='%s.GPU_PROFILER_LIST_CATEGORIES' % package_info.package)) | 
| -    try: | 
| -      json_category_list = device.old_interface.WaitForLogMatch( | 
| -          re.compile(r'{"traceCategoriesList(.*)'), None, timeout=5).group(0) | 
| -    except pexpect.TIMEOUT: | 
| -      raise RuntimeError('Performance trace category list marker not found. ' | 
| -                         'Is the correct version of the browser running?') | 
| - | 
| -    record_categories = [] | 
| -    disabled_by_default_categories = [] | 
| -    json_data = json.loads(json_category_list)['traceCategoriesList'] | 
| -    for item in json_data: | 
| -      if item.startswith('disabled-by-default'): | 
| -        disabled_by_default_categories.append(item) | 
| -      else: | 
| -        record_categories.append(item) | 
| - | 
| -    return record_categories, disabled_by_default_categories | 
| - | 
| -  def StartTracing(self, interval): | 
| -    self._trace_interval = interval | 
| -    self._device.old_interface.SyncLogCat() | 
| -    start_extras = {'categories': ','.join(self._categories)} | 
| -    if self._ring_buffer: | 
| -      start_extras['continuous'] = None | 
| -    self._device.BroadcastIntent(intent.Intent( | 
| -        action='%s.GPU_PROFILER_START' % self._package_info.package, | 
| -        extras=start_extras)) | 
| - | 
| -    if self._trace_memory: | 
| -      self._device.old_interface.EnableAdbRoot() | 
| -      self._device.SetProp(_HEAP_PROFILE_MMAP_PROPERTY, 1) | 
| - | 
| -    # Chrome logs two different messages related to tracing: | 
| -    # | 
| -    # 1. "Logging performance trace to file" | 
| -    # 2. "Profiler finished. Results are in [...]" | 
| -    # | 
| -    # The first one is printed when tracing starts and the second one indicates | 
| -    # that the trace file is ready to be pulled. | 
| -    try: | 
| -      self._device.old_interface.WaitForLogMatch( | 
| -          self._trace_start_re, None, timeout=5) | 
| -    except pexpect.TIMEOUT: | 
| -      raise RuntimeError('Trace start marker not found. Is the correct version ' | 
| -                         'of the browser running?') | 
| - | 
| -  def StopTracing(self): | 
| -    self._device.BroadcastIntent(intent.Intent( | 
| -        action='%s.GPU_PROFILER_STOP' % self._package_info.package)) | 
| -    self._trace_file = self._device.old_interface.WaitForLogMatch( | 
| -        self._trace_finish_re, None, timeout=120).group(1) | 
| -    if self._trace_memory: | 
| -      self._device.SetProp(_HEAP_PROFILE_MMAP_PROPERTY, 0) | 
| - | 
| -  def PullTrace(self): | 
| -    # Wait a bit for the browser to finish writing the trace file. | 
| -    time.sleep(self._trace_interval / 4 + 1) | 
| - | 
| -    trace_file = self._trace_file.replace('/storage/emulated/0/', '/sdcard/') | 
| -    host_file = os.path.join(os.path.curdir, os.path.basename(trace_file)) | 
| -    self._device.PullFile(trace_file, host_file) | 
| -    return host_file | 
|  |