[polymer] Merge of master into polymer10-migration

systrace/profile_chrome/profiler.py

 # 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 os
 
 from devil.android.constants import chrome
 
 from profile_chrome import trace_packager
 from profile_chrome import ui
@@ skipping 28 matching lines @@
 def GetSupportedBrowsers():
   """Returns the package names of all supported browsers."""
   # Add aliases for backwards compatibility.
   supported_browsers = {
     'stable': chrome.PACKAGE_INFO['chrome_stable'],
     'beta': chrome.PACKAGE_INFO['chrome_beta'],
     'dev': chrome.PACKAGE_INFO['chrome_dev'],
     'build': chrome.PACKAGE_INFO['chrome'],
   }
   supported_browsers.update(chrome.PACKAGE_INFO)
-  unsupported_browsers = ['content_browsertests', 'gtest', 'legacy_browser']
-  for browser in unsupported_browsers:
-    if browser in supported_browsers:
-      del supported_browsers[browser]
   return supported_browsers
 
 
 def CaptureProfile(controllers, interval, output=None, compress=False,
                    write_json=False):
   """Records a profiling trace saves the result to a file.
 
   Args:
     controllers: List of tracing controllers.
     interval: Time interval to capture in seconds. An interval of None (or 0)
@@ skipping 16 matching lines @@
     else:
       ui.PrintMessage('Capturing %s. Press Enter to stop...' % \
           trace_type, eol='')
       raw_input()
   finally:
     _StopTracing(controllers)
   if interval:
     ui.PrintMessage('done')
 
   return _PullTraces(controllers, output, compress, write_json)