Get rid of the multiple includes of browser_action_test_util files in browser.lib and browser_tests…

chrome/chrome_tests.gypi

 # Copyright (c) 2012 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 2714 matching lines @@
         'browser/extensions/api/web_request/web_request_apitest.cc',
         'browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_apitest.cc',
         'browser/extensions/api/webstore_private/webstore_private_apitest.cc',
         'browser/extensions/app_background_page_apitest.cc',
         'browser/extensions/app_notification_browsertest.cc',
         'browser/extensions/app_process_apitest.cc',
         'browser/extensions/autoupdate_interceptor.cc',
         'browser/extensions/autoupdate_interceptor.h',
         'browser/extensions/background_page_apitest.cc',
         'browser/extensions/background_scripts_apitest.cc',
-        'browser/extensions/browser_action_test_util.h',
-        'browser/extensions/browser_action_test_util_gtk.cc',
-        'browser/extensions/browser_action_test_util_mac.mm',
         'browser/extensions/chrome_app_api_browsertest.cc',
         'browser/extensions/content_script_apitest.cc',
         'browser/extensions/content_security_policy_apitest.cc',
         'browser/extensions/convert_web_app_browsertest.cc',
         'browser/extensions/cross_origin_xhr_apitest.cc',
         'browser/extensions/crx_installer_browsertest.cc',
         'browser/extensions/events_apitest.cc',
         'browser/extensions/execute_script_apitest.cc',
         'browser/extensions/extension_apitest.cc',
         'browser/extensions/extension_apitest.h',
@@ skipping 156 matching lines @@
         'browser/ui/prefs/prefs_tab_helper_browsertest.cc',
         'browser/ui/startup/startup_browser_creator_browsertest.cc',
         'browser/ui/tab_modal_confirm_dialog_browsertest_mac.mm',
         'browser/ui/tab_modal_confirm_dialog_browsertest.cc',
         'browser/ui/tab_modal_confirm_dialog_browsertest.h',
         'browser/ui/views/ash/browser_non_client_frame_view_ash_browsertest.cc',
         'browser/ui/views/ash/caps_lock_handler_browsertest.cc',
         'browser/ui/views/ash/launcher/chrome_launcher_controller_browsertest.cc',
         'browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc',
         'browser/ui/views/ash/volume_controller_browsertest_chromeos.cc',
-        'browser/ui/views/browser_action_test_util_views.cc',
         'browser/ui/views/browser_actions_container_browsertest.cc',
         'browser/ui/views/constrained_window_views_browsertest.cc',
         'browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.cc',
         'browser/ui/views/frame/browser_view_browsertest.cc',
         'browser/ui/views/select_file_dialog_extension_browsertest.cc',
         'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc',
         'browser/ui/views/web_dialog_view_browsertest.cc',
         'browser/ui/webui/chrome_url_data_manager_browsertest.cc',
         'browser/ui/webui/help/help_browsertest.js',
         'browser/ui/webui/ntp/most_visited_browsertest.cc',
@@ skipping 247 matching lines @@
             ['exclude', '^browser/captive_portal/'],
           ],
         }],
         ['internal_pdf', {
           'sources': [
             'browser/ui/pdf/pdf_browsertest.cc',
           ],
         }],
         ['OS!="linux" or toolkit_views==1', {
           'sources!': [
-            'browser/extensions/browser_action_test_util_gtk.cc',
             'browser/ui/gtk/view_id_util_browsertest.cc',
           ],
         }],
         ['OS=="linux"', {
           'sources!': [
             '../content/browser/accessibility/dump_accessibility_tree_browsertest.cc',
             '../content/browser/accessibility/dump_accessibility_tree_helper.cc',
           ],
         }],
         ['OS!="win" and OS!="mac"', {
@@ skipping 97 matching lines @@
             'browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc',
             '../content/renderer/external_popup_menu_browsertest.cc',
           ],
           'sources!': [
             # TODO(hbono): This test depends on hunspell and we cannot run it on
             # Mac, which does not use hunspell by default.
             'browser/spellchecker/spellcheck_host_browsertest.cc',
             # ProcessSingletonMac doesn't do anything.
             'browser/process_singleton_browsertest.cc',
           ],
-        }, { # else: OS != "mac"
-          'sources!': [
-            'browser/extensions/browser_action_test_util_mac.mm',
-          ],
         }],
         ['os_posix == 0 or chromeos == 1', {
           'sources!': [
             'common/time_format_browsertest.cc',
           ],
         }],
         ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
@@ skipping 157 matching lines @@
             'python',
             '<@(_inputs)',
             'webui',
             '<(RULE_INPUT_PATH)',
             'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
             '<@(_outputs)',
           ],
         },
       ],
       'conditions': [
-        ['OS!="linux" or toolkit_views==1', {
-          'sources!': [
-            'browser/extensions/browser_action_test_util_gtk.cc',
-          ],
-        }],
         ['OS=="win"', {
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
@@ skipping 57 matching lines @@
             'OTHER_LDFLAGS': [
               '-Wl,-ObjC',
             ],
           },
           # Other platforms only need
           # chrome_resources.gyp:{packed_extra_resources,packed_resources},
           # and can build this target standalone much faster.
           'dependencies': [
             'chrome'
           ],
-        }, { # else: OS != "mac"
-          'sources!': [
-            'browser/extensions/browser_action_test_util_mac.mm',
-          ],
         }],
         ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
@@ skipping 1115 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }