MacViewsBrowser: Get browser_tests linking

chrome/chrome_tests.gypi

 # 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': {
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/extensions/browsertest_util.cc',
@@ skipping 442 matching lines @@
       'browser/ui/autofill/password_generation_popup_view_browsertest.cc',
       'browser/ui/autofill/password_generation_popup_view_tester.h',
       'browser/ui/blocked_content/popup_blocker_browsertest.cc',
       'browser/ui/bookmarks/bookmark_browsertest.cc',
       'browser/ui/browser_browsertest.cc',
       'browser/ui/browser_command_controller_browsertest.cc',
       'browser/ui/browser_navigator_browsertest.cc',
       'browser/ui/browser_navigator_browsertest.h',
       'browser/ui/browser_navigator_browsertest_chromeos.cc',
       'browser/ui/browser_tabrestore_browsertest.cc',
-      'browser/ui/cocoa/accelerators_cocoa_browsertest.mm',
-      'browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm',
-      'browser/ui/cocoa/applescript/window_applescript_test.mm',
-      'browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm',
-      'browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm',
-      'browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm',
-      'browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h',
-      'browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.mm',
-      'browser/ui/cocoa/browser_window_controller_browsertest.mm',
-      'browser/ui/cocoa/certificate_viewer_mac_browsertest.mm',
-      'browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm',
-      'browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm',
-      'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_browsertest.mm',
-      'browser/ui/cocoa/dev_tools_controller_browsertest.mm',
-      'browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm',
-      'browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h',
-      'browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm',
-      'browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm',
-      'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm',
-      'browser/ui/cocoa/extensions/windowed_install_dialog_controller_browsertest.mm',
-      'browser/ui/cocoa/find_bar/find_bar_browsertest.mm',
-      'browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm',
-      'browser/ui/cocoa/omnibox/omnibox_view_mac_browsertest.mm',
-      'browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm',
-      'browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm',
-      'browser/ui/cocoa/passwords/passwords_bubble_browsertest.mm',
-      'browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm',
-      'browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm',
-      'browser/ui/cocoa/view_id_util_browsertest.mm',
-      'browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm',
-      'browser/ui/cocoa/website_settings/permission_bubble_cocoa_browser_test.mm',
       'browser/ui/content_settings/content_setting_bubble_model_browsertest.cc',
       'browser/ui/content_settings/content_setting_image_model_browsertest.cc',
       'browser/ui/exclusive_access/fullscreen_controller_browsertest.cc',
       'browser/ui/extensions/extension_message_bubble_browsertest.cc',
       'browser/ui/extensions/extension_message_bubble_browsertest.h',
       'browser/ui/extensions/hosted_app_browsertest.cc',
       'browser/ui/find_bar/find_bar_host_browsertest.cc',
       'browser/ui/location_bar/location_bar_browsertest.cc',
       'browser/ui/login/login_prompt_browsertest.cc',
       'browser/ui/native_window_tracker_browsertest.cc',
@@ skipping 100 matching lines @@
       'test/data/webui/history_ui_browsertest.h',
       'test/data/webui/ntp4_browsertest.cc',
       'test/data/webui/ntp4_browsertest.h',
       'test/data/webui/print_preview.cc',
       'test/data/webui/print_preview.h',
       'test/data/webui/webui_resource_browsertest.cc',
       'test/gpu/webgl_infobar_browsertest.cc',
       'test/ppapi/ppapi_browsertest.cc',
       'test/ppapi/ppapi_filechooser_browsertest.cc',
     ],
+    # Tests corresponding to the files in chrome_browser_ui_cocoa_sources.
+    # Built on Mac, except when mac_views_browser==1.
+    'chrome_browser_tests_cocoa_sources': [
+      'browser/ui/cocoa/accelerators_cocoa_browsertest.mm',
+      'browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm',
+      'browser/ui/cocoa/applescript/window_applescript_test.mm',
+      'browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm',
+      'browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm',
+      'browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm',
+      'browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h',
+      'browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.mm',
+      'browser/ui/cocoa/browser_window_controller_browsertest.mm',
+      'browser/ui/cocoa/certificate_viewer_mac_browsertest.mm',
+      'browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm',
+      'browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm',
+      'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_browsertest.mm',
+      'browser/ui/cocoa/dev_tools_controller_browsertest.mm',
+      'browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm',
+      'browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h',
+      'browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm',
+      'browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm',
+      'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm',
+      'browser/ui/cocoa/extensions/windowed_install_dialog_controller_browsertest.mm',
+      'browser/ui/cocoa/find_bar/find_bar_browsertest.mm',
+      'browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm',
+      'browser/ui/cocoa/omnibox/omnibox_view_mac_browsertest.mm',
+      'browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm',
+      'browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm',
+      'browser/ui/cocoa/passwords/passwords_bubble_browsertest.mm',
+      'browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm',
+      'browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm',
+      'browser/ui/cocoa/view_id_util_browsertest.mm',
+      'browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm',
+      'browser/ui/cocoa/website_settings/permission_bubble_cocoa_browser_test.mm',
+    ],
     'chrome_browser_tests_ash_sources': [
       'browser/ui/ash/accelerator_commands_browsertest.cc',
       'browser/ui/ash/accelerator_controller_browsertest.cc',
       'browser/ui/ash/keyboard_controller_browsertest.cc',
       'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
       'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
       'browser/ui/ash/multi_user/multi_user_window_manager_test.cc',
       'browser/ui/ash/multi_user/multi_user_window_manager_test.h',
       'browser/ui/ash/shelf_browsertest.cc',
       'browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc',
       'browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc',
       'browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc',
       'browser/ui/ash/volume_controller_browsertest_chromeos.cc',
       'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
     ],
     # Cross-platform views browser tests ready for toolkit-views on Mac.
     'chrome_browser_tests_views_sources': [
       'browser/ui/global_error/global_error_service_browsertest.cc',
       'browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc',
       'browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc',
       'browser/ui/views/select_file_dialog_extension_browsertest.cc',
     ],
     # Cross-platform (except Mac) views browser tests. Assumes app list is
     # enabled (as for chrome_browser_ui_views_non_mac_sources).
     'chrome_browser_tests_views_non_mac_sources': [

[Matt Giuca, 2016/01/29 02:07:03]

Maybe this should get renamed now that it can be included on Mac?

Definitely should at least update the comment.

[tapted, 2016/01/29 03:27:45]

Done. Updated comment, but kept the "non_mac" bit since it's easier to
understand than this views-browser thing (i.e. as far as a current Chrome
release is concerned, they are still non_mac)

-      # TODO(tapted): These assume the AppListService is views-based. Enable
-      # with toolkit-views app launcher on Mac. http://crbug.com/365977.
-      'browser/apps/custom_launcher_page_browsertest_views.cc',
+      # This assumes the AppListService is views-based.
       'browser/ui/app_list/app_list_service_views_browsertest.cc',
 
       # TODO(tapted): Move these to chrome_browser_tests_views_sources when the
       # the corresponding files are moved in chrome_browser_ui.gypi (i.e. out of
       # chrome_browser_ui_views_non_mac_sources). http://crbug.com/404979.
       'browser/ui/views/autofill/autofill_dialog_view_tester_views.cc',
       'browser/ui/views/autofill/autofill_dialog_view_tester_views.h',
       'browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc',
       'browser/ui/views/autofill/card_unmask_prompt_view_tester_views.cc',
       'browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h',
       'browser/ui/views/autofill/password_generation_popup_view_tester_views.cc',
       'browser/ui/views/autofill/password_generation_popup_view_tester_views.h',
       'browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc',
       'browser/ui/views/collected_cookies_views_browsertest.cc',
       'browser/ui/views/extensions/bookmark_override_browsertest.cc',
       'browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc',
       'browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc',
       'browser/ui/views/frame/browser_view_browsertest.cc',
       'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc',
       'browser/ui/views/media_router/media_router_ui_browsertest.cc',
       'browser/ui/views/new_task_manager_view_browsertest.cc',
       'browser/ui/views/passwords/password_dialog_view_browsertest.cc',
       'browser/ui/views/toolbar/browser_actions_container_browsertest.cc',
       'browser/ui/views/toolbar/toolbar_view_browsertest.cc',
       'browser/ui/views/translate/translate_bubble_view_browsertest.cc',
       'browser/ui/views/web_dialog_view_browsertest.cc',
     ],
     'chrome_browser_tests_chromeos_sources': [
+      'browser/apps/custom_launcher_page_browsertest_views.cc',

[tapted, 2016/01/27 02:38:34]

This doesn't compile on Mac because the ui::test::EventGenerator expects to
receive a ui::EventTarget for some methods, and on Mac we pass an NSWindow
rather than an aura::Window. I could work around that with #ifdefs or something,
but really only ChromeOS cares about these tests, and that's unlikely to change,
so I went with this approach.

[Matt Giuca, 2016/01/29 02:07:03]

Acknowledged.

       'browser/chromeos/accessibility/accessibility_manager_browsertest.cc',
       'browser/chromeos/accessibility/magnification_manager_browsertest.cc',
       'browser/chromeos/accessibility/speech_monitor.cc',
       'browser/chromeos/accessibility/speech_monitor.h',
       'browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc',
       'browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc',
       'browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc',
       'browser/chromeos/attestation/attestation_policy_browsertest.cc',
       'browser/chromeos/customization/customization_document_browsertest.cc',
       'browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc',
@@ skipping 1816 matching lines @@
             # ProcessSingletonMac doesn't do anything.
             'browser/process_singleton_browsertest.cc',
             # single-process mode hangs on Mac sometimes because of multiple UI
             # message loops. See 306348
             'renderer/safe_browsing/phishing_classifier_browsertest.cc',
             'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc',
             # This tests the language options UI features that do not exist on
             # Mac.
             'browser/ui/webui/options/multilanguage_options_webui_browsertest.js',
           ],
+          'conditions': [
+            # The browser window can be views or Cocoa on Mac. Test accordingly.
+            ['mac_views_browser==1', {
+              'sources': [ '<@(chrome_browser_tests_views_non_mac_sources)' ],
+            }, {
+              'sources': [ '<@(chrome_browser_tests_cocoa_sources)' ],
+            }],
+          ],
         }],  # OS=="mac"
         ['OS=="mac" or OS=="win"', {
           'sources': [
             'browser/extensions/api/networking_private/networking_private_apitest.cc',
             'browser/extensions/api/networking_private/networking_private_service_client_apitest.cc',
             'browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc',
             'browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc',
           ],
           'dependencies': [
             '../components/components.gyp:wifi_test_support',
@@ skipping 1030 matching lines @@
             'browser',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }