[polymer] Merge of master into polymer10-migration

PRESUBMIT.py

 # Copyright 2015 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.
 
 """Top-level presubmit script for catapult.
 
 See https://www.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into depot_tools.
 """
 import re
@@ skipping 26 matching lines @@
     r'^tracing[\\/]test_data[\\/].*',
     r'^tracing[\\/]third_party[\\/].*',
     r'^telemetry[\\/]support[\\/]html_output[\\/]results-template.html',
 )
 
 
 _CATAPULT_BUG_ID_RE = re.compile(r'#[1-9]\d*')
 _RIETVELD_BUG_ID_RE = re.compile(r'[1-9]\d*')
 _RIETVELD_REPOSITORY_NAMES = frozenset({'chromium', 'v8'})
 
-
-def GetPreferredTryMasters(project, change):
-  return {
-      'tryserver.client.catapult': {
-          'Catapult Android Tryserver': {'defaulttests'},
-          'Catapult Linux Tryserver': {'defaulttests'},
-          'Catapult Mac Tryserver': {'defaulttests'},
-          'Catapult Windows Tryserver': {'defaulttests'},
-      }
-  }
-
-
 def CheckChangeLogBug(input_api, output_api):
   # Show a presubmit message if there is no BUG= line.
   if input_api.change.BUG is None:
     return [output_api.PresubmitNotifyResult(
         'If this change has associated Catapult and/or Rietveld bug(s), add a '
         '"BUG=<bug>(, <bug>)*" line to the patch description where <bug> can '
         'be one of the following: catapult:#NNNN, ' +
         ', '.join('%s:NNNNNN' % n for n in _RIETVELD_REPOSITORY_NAMES) + '.')]
 
   # Throw a presubmit error if the BUG= line is provided but empty.
@@ skipping 69 matching lines @@
     sys.path.remove(input_api.PresubmitLocalPath())
   return results
 
 
 def CheckChangeOnUpload(input_api, output_api):
   return CheckChange(input_api, output_api)
 
 
 def CheckChangeOnCommit(input_api, output_api):
   return CheckChange(input_api, output_api)