Remove Skia's forked buildbot code

master/skia_master_scripts/drt_canary_factory.py

Index: master/skia_master_scripts/drt_canary_factory.py
diff --git a/master/skia_master_scripts/drt_canary_factory.py b/master/skia_master_scripts/drt_canary_factory.py
deleted file mode 100644
index 20e6a77dd05fdcf3c424029e90f0111fed9cbbbb..0000000000000000000000000000000000000000
--- a/master/skia_master_scripts/drt_canary_factory.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright (c) 2013 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.
-
-
-from buildbot.process.properties import WithProperties
-
-import builder_name_schema
-import factory
-import os
-
-
-class DRTCanaryFactory(factory.SkiaFactory):
-  """ Subclass of Factory which builds Chrome with LKGR Skia, runs layout tests,
-  then updates Skia to the most recent revision and runs the layout tests again,
-  looking for diffs.
-  """
-  def __init__(self, path_to_skia, **kwargs):
-    """ Instantiates a DRTCanaryFactory.
-
-    path_to_skia: list of strings; indicates the path from the root of the
-        project to the project's copy of Skia.
-    """
-    factory.SkiaFactory.__init__(self,
-                                 flavor='chrome_canary',
-                                 build_targets=['content_shell',
-                                                'dump_syms',
-                                                'minidump_stackwalk'],
-                                 **kwargs)
-    self._path_to_skia = self.TargetPath.join(*path_to_skia)
-
-  # pylint: disable=W0221
-  def Update(self, use_lkgr_skia=False):
-    """ Override of Update() which may sync Skia to LKGR instead of
-    self._revision, without setting got_revision. """
-    args = ['--gyp_defines',
-            ' '.join('%s=%s' % (k, v) for k, v in self._gyp_defines.items())]
-    if use_lkgr_skia:
-      args.extend(['--use_lkgr_skia', 'True'])
-    else:
-      args.extend(['--chrome_rev', WithProperties('%(chrome_revision)s')])
-
-    self.AddFlavoredSlaveScript(
-        script=self.TargetPath.join(os.pardir, os.pardir, os.pardir, os.pardir,
-                                    os.pardir, 'slave', 'skia_slave_scripts',
-                                    '%s_update.py' % self._flavor),
-        description='Update',
-        timeout=None,
-        halt_on_failure=True,
-        is_rebaseline_step=True,
-        get_props_from_stdout=(
-            {'chrome_revision': 'Chrome updated to (\w+)',
-             'skia_base_rev': 'Skia updated to (\w+)'} if use_lkgr_skia
-            else {'chrome_revision2': 'Chrome updated to (\w+)',
-                  'got_revision': 'Skia updated to (\w+)'}),
-        workdir='build',
-        args=args)
-
-  def PreTest(self):
-    """ Step to run before running tests. """
-    self.AddFlavoredSlaveScript(script='chrome_drt_canary_pretest.py',
-                                description='PreTest')
-
-  def RunWebkitTests(self, new_baseline=False):
-    self.AddFlavoredSlaveScript(script='chrome_drt_canary_run_webkit_tests.py',
-                                description='RunWebkitTests',
-                                args=(['--new_baseline', 'True']
-                                          if new_baseline
-                                          else ['--write_results', 'True']))
-
-  def UploadTestResults(self):
-    self.AddFlavoredSlaveScript(script='chrome_drt_canary_upload_results.py',
-                                description='UploadTestResults',
-                                is_upload_render_step=True)
-
-  def Build(self, role=builder_name_schema.BUILDER_ROLE_CANARY, clobber=None):
-    """Build and return the complete BuildFactory.
-
-    role: string; type of builder.
-    """
-    if role != builder_name_schema.BUILDER_ROLE_CANARY:
-      raise Exception('Canary builders must have role "%s"' %
-                      builder_name_schema.BUILDER_ROLE_CANARY)
-
-    self.UpdateScripts()
-    self.Update(use_lkgr_skia=True)
-    self.Compile(retry_without_werr_on_failure=True)
-    self.PreTest()
-    self.RunWebkitTests(new_baseline=True)
-    self.Update(use_lkgr_skia=False)
-    if self._do_patch_step:
-      self.ApplyPatch()
-    self.Compile(retry_without_werr_on_failure=True)
-    self.RunWebkitTests(new_baseline=False)
-    self.UploadTestResults()
-    self.Validate()
-    return self