From 7dba71bfbca9391d456d2e3620038810c007db8a Mon Sep 17 00:00:00 2001
From: "phajdan.jr" <phajdan.jr@chromium.org>
Date: Mon, 4 Jul 2016 06:28:31 -0700
Subject: [PATCH] remove blink_or_chromium gclient config

It's not needed after blink merge.

TBR=emso, sergiyb, tandrii

BUG=none

Review-Url: https://codereview.chromium.org/2117063002
---
 recipe_modules/gclient/api.py     | 17 -----------------
 recipe_modules/gclient/config.py  |  8 --------
 recipe_modules/gclient/example.py |  1 -
 3 files changed, 26 deletions(-)

diff --git a/recipe_modules/gclient/api.py b/recipe_modules/gclient/api.py
index fe11fd057..64233fca4 100644
--- a/recipe_modules/gclient/api.py
+++ b/recipe_modules/gclient/api.py
@@ -32,23 +32,6 @@ class RevisionFallbackChain(RevisionResolver):
             self._default)
 
 
-class ProjectRevisionResolver(RevisionResolver):
-  """Revision resolver that takes into account the project."""
-  def __init__(self, project, parent_got_revision=None):
-    self.project = project
-    self.parent_got_revision = parent_got_revision or 'parent_got_revision'
-
-  # TODO(phajdan.jr): Move to proper repo and add coverage.
-  def resolve(self, properties):  # pragma: no cover
-    """Resolve the revision if project matches, otherwise default to HEAD."""
-    if properties.get('project') == self.project:
-      return (properties.get(self.parent_got_revision) or
-              properties.get('revision') or
-              'HEAD')
-    return (properties.get(self.parent_got_revision) or
-            'HEAD')
-
-
 def jsonish_to_python(spec, is_top=False):
   """Turn a json spec into a python parsable object.
 
diff --git a/recipe_modules/gclient/config.py b/recipe_modules/gclient/config.py
index cb70c13ac..cd2e0957e 100644
--- a/recipe_modules/gclient/config.py
+++ b/recipe_modules/gclient/config.py
@@ -239,14 +239,6 @@ def blink(c):
   del c.solutions[0].custom_deps
   c.revisions['src/third_party/WebKit'] = 'HEAD'
 
-@config_ctx(includes=['chromium'])
-def blink_or_chromium(c):
-  c.solutions[0].revision = gclient_api.ProjectRevisionResolver('chromium')
-  del c.solutions[0].custom_deps
-  c.revisions['src/third_party/WebKit'] = \
-      gclient_api.ProjectRevisionResolver(
-          'webkit', parent_got_revision='parent_got_webkit_revision')
-
 # TODO(phajdan.jr): Move to proper repo and add coverage.
 @config_ctx(includes=['chromium'])
 def blink_merged(c):  # pragma: no cover
diff --git a/recipe_modules/gclient/example.py b/recipe_modules/gclient/example.py
index c970109a6..1b83a0d17 100644
--- a/recipe_modules/gclient/example.py
+++ b/recipe_modules/gclient/example.py
@@ -13,7 +13,6 @@ TEST_CONFIGS = [
   'android',
   'android_bare',
   'blink',
-  'blink_or_chromium',
   'boringssl',
   'build_internal',
   'build_internal_scripts_slave',