Part 2 of reapplying r64637.

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 3347 matching lines @@
         'browser/worker_host/worker_document_set.h',
         'browser/worker_host/worker_process_host.cc',
         'browser/worker_host/worker_process_host.h',
         'browser/worker_host/worker_service.cc',
         'browser/worker_host/worker_service.h',
         'browser/wrench_menu_model.cc',
         'browser/wrench_menu_model.h',
         'browser/zygote_host_linux.cc',
         'browser/zygote_main_linux.cc',
 
-        # TODO(erg): http://crbug.com/51409 These files are also specified as
-        # part of the automation project, but we need these definitions here,
-        # too, due to usage in our automation provider.
-        'test/automation/automation_messages.cc',
-        'test/automation/automation_messages.h',
-
         # These files are generated by GRIT.
         '<(grit_out_dir)/grit/bookmark_manager_resources_map.cc',
         '<(grit_out_dir)/grit/shared_resources_map.cc',
         '<(grit_out_dir)/grit/theme_resources_map.cc',
       ],
       'conditions': [
         ['javascript_engine=="v8"', {
           'defines': [
             'CHROME_V8',
           ],
@@ skipping 904 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: