chromium_tests: fix crash in deapply_patch on got_webkit_revision

scripts/slave/recipe_modules/gclient/config.py

 # Copyright 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.
 
 import types
 
 from recipe_engine.config import config_item_context, ConfigGroup, BadConf
 from recipe_engine.config import ConfigList, Dict, Single, Static, Set, List
 
 from . import api as gclient_api
@@ skipping 113 matching lines @@
   s.custom_vars = mirror_only(c, {
     'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s',
     'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk',
     'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s',
     'webkit_trunk': BlinkURL(c)})
   m = c.got_revision_mapping
   m['src'] = 'got_revision'
   m['src/native_client'] = 'got_nacl_revision'
   m['src/tools/swarming_client'] = 'got_swarming_client_revision'
   m['src/v8'] = 'got_v8_revision'
-  m['src/third_party/WebKit'] = 'got_webkit_revision'
   m['src/third_party/webrtc'] = 'got_webrtc_revision'
 
   p = c.parent_got_revision_mapping
   p['parent_got_revision'] = None
   p['parent_got_nacl_revision'] = 'nacl_revision'
   p['parent_got_swarming_client_revision'] = 'swarming_revision'
   p['parent_got_v8_revision'] = 'v8_revision'
-  p['parent_got_webkit_revision'] = 'webkit_revision'
   p['parent_got_webrtc_revision'] = 'webrtc_revision'
 
   # Patch project revisions are applied whenever patch_project is set. E.g. if
   # a v8 stand-alone patch is sent to a chromium trybot, patch_project is v8
   # and can be used to sync v8 to HEAD instead of the pinned chromium
   # version.
   patch_project_revisions = {
     'v8': ('src/v8', 'HEAD'),
   }
 
@@ skipping 77 matching lines @@
   c.solutions[0].revision = 'HEAD'
   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')

[Primiano Tucci (use gerrit), 2015/09/23 17:07:07]

shouldn't we remove this as well?

 
 @config_ctx(includes=['chromium'])
 def blink_merged(c):
   c.solutions[0].url = \
       'https://chromium.googlesource.com/playground/chromium-blink-merge.git'
 
 @config_ctx()
 def android(c):
   c.target_os.add('android')
 
@@ skipping 322 matching lines @@
   c.with_branch_heads = True
 
 @config_ctx()
 def custom_tabs_client(c):
   soln = c.solutions.add()
   soln.name = 'custom_tabs_client'
   # TODO(pasko): test custom-tabs-client within a full chromium checkout.
   soln.url = ('https://chromium.googlesource.com/external/github.com/'
               'GoogleChrome/custom-tabs-client.git')
   c.got_revision_mapping['custom_tabs_client'] = 'got_revision'