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

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi	(revision 143189)
+++ chrome/chrome_tests.gypi	(working copy)
@@ -2732,9 +2732,6 @@
         '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',
@@ -2911,7 +2908,6 @@
         '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',
@@ -3179,7 +3175,6 @@
         }],
         ['OS!="linux" or toolkit_views==1', {
           'sources!': [
-            'browser/extensions/browser_action_test_util_gtk.cc',
             'browser/ui/gtk/view_id_util_browsertest.cc',
           ],
         }],
@@ -3297,10 +3292,6 @@
             # 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!': [
@@ -3478,11 +3469,6 @@
         },
       ],
       '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',
@@ -3560,10 +3546,6 @@
           'dependencies': [
             'chrome'
           ],
-        }, { # else: OS != "mac"
-          'sources!': [
-            'browser/extensions/browser_action_test_util_mac.mm',
-          ],
         }],
         ['os_posix == 1 and OS != "mac"', {
           'conditions': [