Merge 54867 - ChromeFrame currently overrides the request context for interce...

chrome/chrome_browser.gypi

 # Copyright (c) 2010 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
@@ skipping 173 matching lines @@
         'browser/autofill/select_control_handler.cc',
         'browser/autofill/select_control_handler.h',
         'browser/automation/automation_autocomplete_edit_tracker.h',
         'browser/automation/automation_browser_tracker.h',
         'browser/automation/extension_automation_constants.h',
         'browser/automation/extension_automation_constants.cc',
         'browser/automation/automation_extension_function.h',
         'browser/automation/automation_extension_function.cc',
         'browser/automation/automation_extension_tracker.cc',
         'browser/automation/automation_extension_tracker.h',
-        'browser/automation/automation_profile_impl.cc',
-        'browser/automation/automation_profile_impl.h',
         'browser/automation/automation_provider_chromeos.cc',
         'browser/automation/automation_provider_gtk.cc',
         'browser/automation/automation_provider_mac.mm',
         'browser/automation/automation_provider_views.cc',
         'browser/automation/automation_provider_win.cc',
         'browser/automation/automation_provider.cc',
         'browser/automation/automation_provider.h',
         'browser/automation/automation_provider_json.h',
         'browser/automation/automation_provider_json.cc',
         'browser/automation/automation_provider_list.cc',
@@ skipping 3461 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: