Merge weburlrequest_extradata_impl.cc/h into content/child/request_extra_data.cc/h (attempt #2)

webkit/child/webkit_child.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'conditions': [
     ['OS=="android"',
@@ skipping 43 matching lines @@
       # include the header generated above.
       'hard_dependency': 1,
       'sources': [
         'multipart_response_delegate.cc',
         'multipart_response_delegate.h',
         'resource_loader_bridge.cc',
         'resource_loader_bridge.h',
         'touch_fling_gesture_curve.cc',
         'touch_fling_gesture_curve.h',
         'webkit_child_export.h',
-        'weburlrequest_extradata_impl.cc',
-        'weburlrequest_extradata_impl.h',
         'weburlresponse_extradata_impl.cc',
         'weburlresponse_extradata_impl.h',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267 ],
       'conditions': [
         ['OS=="mac"',
           {
             'link_settings': {
               'libraries': [
                 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
               ],
             },
           }
         ],
         ['OS=="android"',
           {
             'dependencies': [
               'overscroller_jni_headers',
             ],
           }
         ],
       ],
     },
   ],
 }