[MacViews] Get unit_tests linking.

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index d4aca775632f9f17e985ef4aef882b1f716c109a..af11c03a3e239c1c5fe4be8c1501c098a8732c0d 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -256,196 +256,6 @@
       'browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc',
       'browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc',
       'browser/ui/chrome_select_file_policy_unittest.cc',
-      # It is safe to list */cocoa/* files in the "common" file list
-      # without an explicit exclusion since gyp is smart enough to
-      # exclude them from non-Mac builds.
-      'browser/ui/cocoa/accelerators_cocoa_unittest.mm',
-      'browser/ui/cocoa/animatable_image_unittest.mm',
-      'browser/ui/cocoa/animatable_view_unittest.mm',
-      'browser/ui/cocoa/app_menu/app_menu_button_cell_unittest.mm',
-      'browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm',
-      'browser/ui/cocoa/app_menu/menu_tracked_root_view_unittest.mm',
-      'browser/ui/cocoa/applescript/apple_event_util_unittest.mm',
-      'browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h',
-      'browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm',
-      'browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm',
-      'browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm',
-      'browser/ui/cocoa/autofill/autofill_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/autofill/autofill_details_container_unittest.mm',
-      'browser/ui/cocoa/autofill/autofill_main_container_unittest.mm',
-      'browser/ui/cocoa/autofill/autofill_notification_container_unittest.mm',
-      'browser/ui/cocoa/autofill/autofill_notification_controller_unittest.mm',
-      'browser/ui/cocoa/autofill/autofill_pop_up_button_unittest.mm',
-      'browser/ui/cocoa/autofill/autofill_section_container_unittest.mm',
-      'browser/ui/cocoa/autofill/autofill_section_view_unittest.mm',
-      'browser/ui/cocoa/autofill/autofill_suggestion_container_unittest.mm',
-      'browser/ui/cocoa/autofill/autofill_textfield_unittest.mm',
-      'browser/ui/cocoa/autofill/autofill_tooltip_controller_unittest.mm',
-      'browser/ui/cocoa/autofill/down_arrow_popup_menu_cell_unittest.mm',
-      'browser/ui/cocoa/autofill/layout_view_unittest.mm',
-      'browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm',
-      'browser/ui/cocoa/autofill/save_card_bubble_view_unittest.mm',
-      'browser/ui/cocoa/autofill/simple_grid_layout_unittest.mm',
-      'browser/ui/cocoa/background_gradient_view_unittest.mm',
-      'browser/ui/cocoa/base_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h',
-      'browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm',
-      'browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell_unittest.mm',
-      'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm',
-      'browser/ui/cocoa/browser/zoom_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/browser_window_cocoa_unittest.mm',
-      'browser/ui/cocoa/browser_window_controller_unittest.mm',
-      'browser/ui/cocoa/browser_window_layout_unittest.mm',
-      'browser/ui/cocoa/bubble_view_unittest.mm',
-      'browser/ui/cocoa/chrome_browser_window_unittest.mm',
-      'browser/ui/cocoa/clickhold_button_cell_unittest.mm',
-      'browser/ui/cocoa/cocoa_profile_test.h',
-      'browser/ui/cocoa/cocoa_profile_test.mm',
-      'browser/ui/cocoa/cocoa_test_helper.h',
-      'browser/ui/cocoa/cocoa_test_helper.mm',
-      'browser/ui/cocoa/confirm_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm',
-      'browser/ui/cocoa/constrained_window/constrained_window_alert_unittest.mm',
-      'browser/ui/cocoa/constrained_window/constrained_window_button_unittest.mm',
-      'browser/ui/cocoa/constrained_window/constrained_window_custom_window_unittest.mm',
-      'browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm',
-      'browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm',
-      'browser/ui/cocoa/content_settings/cookie_details_unittest.mm',
-      'browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm',
-      'browser/ui/cocoa/custom_frame_view_unittest.mm',
-      'browser/ui/cocoa/download/download_item_button_unittest.mm',
-      'browser/ui/cocoa/download/download_item_cell_unittest.mm',
-      'browser/ui/cocoa/download/download_item_controller_unittest.mm',
-      'browser/ui/cocoa/download/download_shelf_controller_unittest.mm',
-      'browser/ui/cocoa/download/download_shelf_mac_unittest.mm',
-      'browser/ui/cocoa/download/download_shelf_view_cocoa_unittest.mm',
-      'browser/ui/cocoa/download/download_util_mac_unittest.mm',
-      'browser/ui/cocoa/draggable_button_unittest.mm',
-      'browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm',
-      'browser/ui/cocoa/extensions/browser_actions_container_view_unittest.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_install_view_controller_unittest.mm',
-      'browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm',
-      'browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm',
-      'browser/ui/cocoa/find_bar/find_bar_bridge_unittest.mm',
-      'browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm',
-      'browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm',
-      'browser/ui/cocoa/find_bar/find_bar_text_field_unittest.mm',
-      'browser/ui/cocoa/find_bar/find_bar_view_unittest.mm',
-      'browser/ui/cocoa/find_pasteboard_unittest.mm',
-      'browser/ui/cocoa/first_run_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/floating_bar_backing_view_unittest.mm',
-      'browser/ui/cocoa/framed_browser_window_unittest.mm',
-      'browser/ui/cocoa/fullscreen_window_unittest.mm',
-      'browser/ui/cocoa/gradient_button_cell_unittest.mm',
-      'browser/ui/cocoa/history_menu_bridge_unittest.mm',
-      'browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm',
-      'browser/ui/cocoa/history_overlay_controller_unittest.mm',
-      'browser/ui/cocoa/hover_close_button_unittest.mm',
-      'browser/ui/cocoa/hung_renderer_controller_unittest.mm',
-      'browser/ui/cocoa/image_button_cell_unittest.mm',
-      'browser/ui/cocoa/info_bubble_view_unittest.mm',
-      'browser/ui/cocoa/info_bubble_window_unittest.mm',
-      'browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm',
-      'browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm',
-      'browser/ui/cocoa/infobars/infobar_gradient_view_unittest.mm',
-      'browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc',
-      'browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h',
-      'browser/ui/cocoa/infobars/translate_infobar_unittest.mm',
-      'browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm',
-      'browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm',
-      'browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm',
-      'browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.mm',
-      'browser/ui/cocoa/location_bar/ev_bubble_decoration_unittest.mm',
-      'browser/ui/cocoa/location_bar/image_decoration_unittest.mm',
-      'browser/ui/cocoa/location_bar/keyword_hint_decoration_unittest.mm',
-      'browser/ui/cocoa/location_bar/manage_passwords_decoration_unittest.mm',
-      'browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm',
-      'browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm',
-      'browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm',
-      'browser/ui/cocoa/menu_button_unittest.mm',
-      'browser/ui/cocoa/nsmenuitem_additions_unittest.mm',
-      'browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm',
-      'browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm',
-      'browser/ui/cocoa/omnibox/omnibox_popup_separator_view_unittest.mm',
-      'browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm',
-      'browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm',
-      'browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/panels/panel_cocoa_unittest.mm',
-      'browser/ui/cocoa/passwords/account_chooser_view_controller_unittest.mm',
-      'browser/ui/cocoa/passwords/base_passwords_controller_test.h',
-      'browser/ui/cocoa/passwords/base_passwords_controller_test.mm',
-      'browser/ui/cocoa/passwords/confirmation_password_saved_view_controller_unittest.mm',
-      'browser/ui/cocoa/passwords/credential_item_view_unittest.mm',
-      'browser/ui/cocoa/passwords/manage_passwords_view_controller_unittest.mm',
-      'browser/ui/cocoa/passwords/passwords_bubble_cocoa_unittest.mm',
-      'browser/ui/cocoa/passwords/passwords_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/passwords/passwords_list_view_controller_unittest.mm',
-      'browser/ui/cocoa/passwords/save_pending_password_view_controller_unittest.mm',
-      'browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm',
-      'browser/ui/cocoa/profiles/avatar_button_unittest.mm',
-      'browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm',
-      'browser/ui/cocoa/profiles/avatar_label_button_unittest.mm',
-      'browser/ui/cocoa/profiles/avatar_menu_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm',
-      'browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm',
-      'browser/ui/cocoa/profiles/user_manager_mac_unittest.mm',
-      'browser/ui/cocoa/run_loop_testing_unittest.mm',
-      'browser/ui/cocoa/screen_capture_notification_ui_cocoa_unittest.mm',
-      'browser/ui/cocoa/spinner_view_unittest.mm',
-      'browser/ui/cocoa/sprite_view_unittest.mm',
-      'browser/ui/cocoa/status_bubble_mac_unittest.mm',
-      'browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm',
-      'browser/ui/cocoa/styled_text_field_cell_unittest.mm',
-      'browser/ui/cocoa/styled_text_field_test_helper.h',
-      'browser/ui/cocoa/styled_text_field_test_helper.mm',
-      'browser/ui/cocoa/styled_text_field_unittest.mm',
-      'browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm',
-      'browser/ui/cocoa/tab_contents/sad_tab_view_cocoa_unittest.mm',
-      'browser/ui/cocoa/table_row_nsimage_cache_unittest.mm',
-      'browser/ui/cocoa/tabs/media_indicator_button_cocoa_unittest.mm',
-      'browser/ui/cocoa/tabs/tab_controller_unittest.mm',
-      'browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm',
-      'browser/ui/cocoa/tabs/tab_strip_view_unittest.mm',
-      'browser/ui/cocoa/tabs/tab_view_unittest.mm',
-      'browser/ui/cocoa/task_manager_mac_unittest.mm',
-      'browser/ui/cocoa/toolbar/app_toolbar_button_cell_unittest.mm',
-      'browser/ui/cocoa/toolbar/reload_button_unittest.mm',
-      'browser/ui/cocoa/toolbar/toolbar_button_unittest.mm',
-      'browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm',
-      'browser/ui/cocoa/toolbar/toolbar_view_unittest.mm',
-      'browser/ui/cocoa/translate/translate_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/validation_message_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/vertical_gradient_view_unittest.mm',
-      'browser/ui/cocoa/view_resizer_pong.h',
-      'browser/ui/cocoa/view_resizer_pong.mm',
-      'browser/ui/cocoa/web_dialog_window_controller_unittest.mm',
-      'browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/website_settings/permission_selector_button_unittest.mm',
-      'browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm',
-      'browser/ui/cocoa/window_size_autosaver_unittest.mm',
       'browser/ui/find_bar/find_backend_unittest.cc',
       'browser/ui/login/login_prompt_unittest.cc',
       'browser/ui/passwords/manage_passwords_state_unittest.cc',
@@ -1339,6 +1149,195 @@
       'browser/profiles/profile_list_desktop_unittest.cc',
       'browser/shell_integration_linux_unittest.cc',
     ],
+    # Mac sources, except when mac_views_browser==1

[tapted, 2015/12/17 01:49:19]

nit: maybe something like

# Tests corresponding to the files in chrome_browser_ui_cocoa_sources.
# Built on Mac, except when mac_views_browser==1.

[jackhou1, 2015/12/17 04:03:50]

Done.

+    'chrome_unit_tests_cocoa_sources': [
+      'browser/ui/cocoa/accelerators_cocoa_unittest.mm',
+      'browser/ui/cocoa/animatable_image_unittest.mm',
+      'browser/ui/cocoa/animatable_view_unittest.mm',
+      'browser/ui/cocoa/app_menu/app_menu_button_cell_unittest.mm',
+      'browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm',
+      'browser/ui/cocoa/app_menu/menu_tracked_root_view_unittest.mm',
+      'browser/ui/cocoa/applescript/apple_event_util_unittest.mm',
+      'browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h',
+      'browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm',
+      'browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm',
+      'browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm',
+      'browser/ui/cocoa/autofill/autofill_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/autofill/autofill_details_container_unittest.mm',
+      'browser/ui/cocoa/autofill/autofill_main_container_unittest.mm',
+      'browser/ui/cocoa/autofill/autofill_notification_container_unittest.mm',
+      'browser/ui/cocoa/autofill/autofill_notification_controller_unittest.mm',
+      'browser/ui/cocoa/autofill/autofill_pop_up_button_unittest.mm',
+      'browser/ui/cocoa/autofill/autofill_section_container_unittest.mm',
+      'browser/ui/cocoa/autofill/autofill_section_view_unittest.mm',
+      'browser/ui/cocoa/autofill/autofill_suggestion_container_unittest.mm',
+      'browser/ui/cocoa/autofill/autofill_textfield_unittest.mm',
+      'browser/ui/cocoa/autofill/autofill_tooltip_controller_unittest.mm',
+      'browser/ui/cocoa/autofill/down_arrow_popup_menu_cell_unittest.mm',
+      'browser/ui/cocoa/autofill/layout_view_unittest.mm',
+      'browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa_unittest.mm',
+      'browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm',
+      'browser/ui/cocoa/autofill/save_card_bubble_view_unittest.mm',
+      'browser/ui/cocoa/autofill/simple_grid_layout_unittest.mm',
+      'browser/ui/cocoa/background_gradient_view_unittest.mm',
+      'browser/ui/cocoa/base_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h',
+      'browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm',
+      'browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell_unittest.mm',
+      'browser/ui/cocoa/browser_window_cocoa_unittest.mm',
+      'browser/ui/cocoa/browser_window_controller_unittest.mm',
+      'browser/ui/cocoa/browser_window_layout_unittest.mm',
+      'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm',
+      'browser/ui/cocoa/browser/zoom_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/bubble_view_unittest.mm',
+      'browser/ui/cocoa/chrome_browser_window_unittest.mm',
+      'browser/ui/cocoa/clickhold_button_cell_unittest.mm',
+      'browser/ui/cocoa/cocoa_profile_test.h',
+      'browser/ui/cocoa/cocoa_profile_test.mm',
+      'browser/ui/cocoa/confirm_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm',
+      'browser/ui/cocoa/constrained_window/constrained_window_alert_unittest.mm',
+      'browser/ui/cocoa/constrained_window/constrained_window_button_unittest.mm',
+      'browser/ui/cocoa/constrained_window/constrained_window_custom_window_unittest.mm',
+      'browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm',
+      'browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm',
+      'browser/ui/cocoa/content_settings/cookie_details_unittest.mm',
+      'browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm',
+      'browser/ui/cocoa/custom_frame_view_unittest.mm',
+      'browser/ui/cocoa/download/download_item_button_unittest.mm',
+      'browser/ui/cocoa/download/download_item_cell_unittest.mm',
+      'browser/ui/cocoa/download/download_item_controller_unittest.mm',
+      'browser/ui/cocoa/download/download_shelf_controller_unittest.mm',
+      'browser/ui/cocoa/download/download_shelf_mac_unittest.mm',
+      'browser/ui/cocoa/download/download_shelf_view_cocoa_unittest.mm',
+      'browser/ui/cocoa/download/download_util_mac_unittest.mm',
+      'browser/ui/cocoa/draggable_button_unittest.mm',
+      'browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm',
+      'browser/ui/cocoa/extensions/browser_actions_container_view_unittest.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_install_view_controller_unittest.mm',
+      'browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm',
+      'browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm',
+      'browser/ui/cocoa/find_bar/find_bar_bridge_unittest.mm',
+      'browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm',
+      'browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm',
+      'browser/ui/cocoa/find_bar/find_bar_text_field_unittest.mm',
+      'browser/ui/cocoa/find_bar/find_bar_view_unittest.mm',
+      'browser/ui/cocoa/find_pasteboard_unittest.mm',
+      'browser/ui/cocoa/first_run_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/floating_bar_backing_view_unittest.mm',
+      'browser/ui/cocoa/framed_browser_window_unittest.mm',
+      'browser/ui/cocoa/fullscreen_window_unittest.mm',
+      'browser/ui/cocoa/gradient_button_cell_unittest.mm',
+      'browser/ui/cocoa/history_menu_bridge_unittest.mm',
+      'browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm',
+      'browser/ui/cocoa/history_overlay_controller_unittest.mm',
+      'browser/ui/cocoa/hover_close_button_unittest.mm',
+      'browser/ui/cocoa/hung_renderer_controller_unittest.mm',
+      'browser/ui/cocoa/image_button_cell_unittest.mm',
+      'browser/ui/cocoa/info_bubble_view_unittest.mm',
+      'browser/ui/cocoa/info_bubble_window_unittest.mm',
+      'browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm',
+      'browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm',
+      'browser/ui/cocoa/infobars/infobar_gradient_view_unittest.mm',
+      'browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc',
+      'browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h',
+      'browser/ui/cocoa/infobars/translate_infobar_unittest.mm',
+      'browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm',
+      'browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm',
+      'browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.mm',
+      'browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm',
+      'browser/ui/cocoa/location_bar/ev_bubble_decoration_unittest.mm',
+      'browser/ui/cocoa/location_bar/image_decoration_unittest.mm',
+      'browser/ui/cocoa/location_bar/keyword_hint_decoration_unittest.mm',
+      'browser/ui/cocoa/location_bar/manage_passwords_decoration_unittest.mm',
+      'browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm',
+      'browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm',
+      'browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm',
+      'browser/ui/cocoa/menu_button_unittest.mm',
+      'browser/ui/cocoa/nsmenuitem_additions_unittest.mm',
+      'browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm',
+      'browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm',
+      'browser/ui/cocoa/omnibox/omnibox_popup_separator_view_unittest.mm',
+      'browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm',
+      'browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm',
+      'browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/panels/panel_cocoa_unittest.mm',
+      'browser/ui/cocoa/passwords/account_chooser_view_controller_unittest.mm',
+      'browser/ui/cocoa/passwords/base_passwords_controller_test.h',
+      'browser/ui/cocoa/passwords/base_passwords_controller_test.mm',
+      'browser/ui/cocoa/passwords/confirmation_password_saved_view_controller_unittest.mm',
+      'browser/ui/cocoa/passwords/credential_item_view_unittest.mm',
+      'browser/ui/cocoa/passwords/manage_passwords_view_controller_unittest.mm',
+      'browser/ui/cocoa/passwords/passwords_bubble_cocoa_unittest.mm',
+      'browser/ui/cocoa/passwords/passwords_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/passwords/passwords_list_view_controller_unittest.mm',
+      'browser/ui/cocoa/passwords/save_pending_password_view_controller_unittest.mm',
+      'browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm',
+      'browser/ui/cocoa/profiles/avatar_button_unittest.mm',
+      'browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm',
+      'browser/ui/cocoa/profiles/avatar_label_button_unittest.mm',
+      'browser/ui/cocoa/profiles/avatar_menu_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm',
+      'browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm',
+      'browser/ui/cocoa/profiles/user_manager_mac_unittest.mm',
+      'browser/ui/cocoa/run_loop_testing_unittest.mm',
+      'browser/ui/cocoa/screen_capture_notification_ui_cocoa_unittest.mm',
+      'browser/ui/cocoa/spinner_view_unittest.mm',
+      'browser/ui/cocoa/sprite_view_unittest.mm',
+      'browser/ui/cocoa/status_bubble_mac_unittest.mm',
+      'browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm',
+      'browser/ui/cocoa/styled_text_field_cell_unittest.mm',
+      'browser/ui/cocoa/styled_text_field_test_helper.h',
+      'browser/ui/cocoa/styled_text_field_test_helper.mm',
+      'browser/ui/cocoa/styled_text_field_unittest.mm',
+      'browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm',
+      'browser/ui/cocoa/tab_contents/sad_tab_view_cocoa_unittest.mm',
+      'browser/ui/cocoa/table_row_nsimage_cache_unittest.mm',
+      'browser/ui/cocoa/tabs/media_indicator_button_cocoa_unittest.mm',
+      'browser/ui/cocoa/tabs/tab_controller_unittest.mm',
+      'browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm',
+      'browser/ui/cocoa/tabs/tab_strip_view_unittest.mm',
+      'browser/ui/cocoa/tabs/tab_view_unittest.mm',
+      'browser/ui/cocoa/task_manager_mac_unittest.mm',
+      'browser/ui/cocoa/toolbar/app_toolbar_button_cell_unittest.mm',
+      'browser/ui/cocoa/toolbar/reload_button_unittest.mm',
+      'browser/ui/cocoa/toolbar/toolbar_button_unittest.mm',
+      'browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm',
+      'browser/ui/cocoa/toolbar/toolbar_view_unittest.mm',
+      'browser/ui/cocoa/translate/translate_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/validation_message_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/vertical_gradient_view_unittest.mm',
+      'browser/ui/cocoa/view_resizer_pong.h',
+      'browser/ui/cocoa/view_resizer_pong.mm',
+      'browser/ui/cocoa/web_dialog_window_controller_unittest.mm',
+      'browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/website_settings/permission_selector_button_unittest.mm',
+      'browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm',
+      'browser/ui/cocoa/window_size_autosaver_unittest.mm',
+    ],
     # Cross-platform views unit tests ready for toolkit-views on Mac.
     # TODO(tapted): Enable toolkit-views unit_tests on Mac when their
     # respective implementations are linked in. http://crbug.com/412234.
@@ -1528,7 +1527,6 @@
       'browser/ui/browser_iterator_unittest.cc',
       'browser/ui/browser_unittest.cc',
       'browser/ui/chrome_bubble_manager_unittest.cc',
-      'browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa_unittest.mm',
       'browser/ui/content_settings/content_setting_bubble_model_unittest.cc',
       'browser/ui/content_settings/content_setting_image_model_unittest.cc',
       'browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc',
@@ -1775,8 +1773,8 @@
         'browser/sync/profile_sync_test_util.cc',
         'browser/sync/profile_sync_test_util.h',
         'browser/ui/browser.h',
-        'browser/ui/cocoa/extensions/browser_action_test_util_mac.mm',
-        'browser/ui/cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm',
+        'browser/ui/cocoa/cocoa_test_helper.h',
+        'browser/ui/cocoa/cocoa_test_helper.mm',
         'browser/ui/cocoa/run_loop_testing.h',
         'browser/ui/cocoa/run_loop_testing.mm',
         'browser/ui/exclusive_access/fullscreen_controller_state_test.cc',
@@ -2105,9 +2103,18 @@
             'app/chrome_crash_reporter_client_mac.mm',
             'app/chrome_main_mac.mm',
           ],
-          'sources!': [
-            'browser/ui/views/toolbar/browser_action_test_util_views.cc',
-          ]
+          'conditions': [
+            ['mac_views_browser!=1', {
+              'sources': [
+                'browser/ui/cocoa/extensions/browser_action_test_util_mac.mm',

[tapted, 2015/12/17 01:49:19]

I think gyp still prefers 'add everything and remove`. It's confusing doing both
adds and removes here - there doesn't seem to be an underlying reason why
find_bar_host_unittest_util_views.cc is removed but
browser_action_test_util_mac.mm is added.

Then you can have a positive condition (mac_views_browser==1) and an `else` to
(kinda) match gyp a bit closer. (except removing instead of adding).

[jackhou1, 2015/12/17 04:03:50]

Done.

+                'browser/ui/cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm',
+              ],
+              'sources!': [
+                'browser/ui/views/find_bar_host_unittest_util_views.cc',
+                'browser/ui/views/toolbar/browser_action_test_util_views.cc',

[tapted, 2015/12/17 01:49:19]

how was this getting removed before?

[jackhou1, 2015/12/17 04:03:50]

You mean find_bar_host_unittest_util_views.cc? I'm not sure actually, but it's
explicitly added in GN, and with my changes it fails to link if it's not
removed.

+              ],
+            }],
+          ],
         }],
         ['chromeos==1', {
           'dependencies': [
@@ -2603,6 +2610,11 @@
             'renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc',
             'tools/convert_dict/convert_dict_unittest.cc',
           ],
+          'conditions': [
+            ['mac_views_browser!=1', {

[tapted, 2015/12/17 01:49:19]

There's a fragment below:

            ['OS != "mac"', {
              'sources': [ '<@(chrome_unit_tests_views_non_mac_sources)' ],
            }],

but in chrome_browser_ui.gypi, the condition (for the bit you've added here)
goes:

            ['mac_views_browser==1', {
              'sources': [
                '<@(chrome_browser_ui_views_mac_experimental_sources)',
                '<@(chrome_browser_ui_views_non_mac_sources)',
                '<@(chrome_browser_ui_views_extensions_non_mac_sources)',
              ],
            }, {
              'sources': [ '<@(chrome_browser_ui_cocoa_sources)' ],
            }],


So, can we add chrome_unit_tests_views_non_mac_sources to the mac_views_browser
build yet, so that these are closer?

Otherwise (e.g. if they don't compile yet, which is likely), I think it should
go something like

            ['mac_views_browser==1', {
              // TODO(tapted): Add chrome_unit_tests_views_non_mac_sources here.
            }, {
              'sources': [ '<@(chrome_unit_tests_cocoa_sources)' ],
            }],

This makes it look more like the corresponding non-test conditions.

[jackhou1, 2015/12/17 04:03:50]

Done.

+              'sources': [ '<@(chrome_unit_tests_cocoa_sources)' ],
+            }],
+          ],
           # TODO(mark): We really want this for all non-static library targets,
           # but when we tried to pull it up to the common.gypi level, it broke
           # other things like the ui and startup tests. *shrug*