mac_views_browser: fixed interactive_ui_tests compilation.

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 1028 matching lines @@
       'browser/mouseleave_browsertest.cc',
       'browser/password_manager/password_generation_interactive_uitest.cc',
       'browser/password_manager/password_manager_interactive_uitest.cc',
       'browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc',
       'browser/renderer_context_menu/render_view_context_menu_browsertest_util.h',
       'browser/task_manager/task_manager_browsertest_util.cc',
       'browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc',
       'browser/ui/browser_focus_uitest.cc',
       'browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm',
       'browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm',
-      'browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm',
       'browser/ui/cocoa/panels/panel_cocoa_browsertest.mm',
-      'browser/ui/cocoa/translate/translate_bubble_test_utils_cocoa.mm',
       'browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc',
       'browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc',
       'browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc',
       'browser/ui/find_bar/find_bar_host_interactive_uitest.cc',
       'browser/ui/omnibox/omnibox_view_browsertest.cc',
       'browser/ui/panels/base_panel_browser_test.cc',
       'browser/ui/panels/base_panel_browser_test.h',
       'browser/ui/panels/test_panel_active_state_observer.cc',
       'browser/ui/panels/test_panel_active_state_observer.h',
       'browser/ui/panels/test_panel_collection_squeeze_observer.cc',
@@ skipping 14 matching lines @@
       'browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc',
       'browser/ui/webui/options/language_dictionary_interactive_uitest.cc',
       'browser/ui/webui/options/language_options_interactive_uitest.cc',
       'test/base/always_on_top_window_killer_win.cc',
       'test/base/always_on_top_window_killer_win.h',
       'test/base/interactive_test_utils.cc',
       'test/base/interactive_test_utils.h',
       'test/base/interactive_test_utils_aura.cc',
       'test/base/interactive_test_utils_aura.h',
       'test/base/interactive_test_utils_mac.mm',
-      'test/base/interactive_test_utils_views.cc',
+      'test/base/interactive_test_utils_common_views.cc',
       'test/base/interactive_test_utils_win.cc',
       'test/base/interactive_ui_tests_main.cc',
       'test/base/view_event_test_platform_part.h',
       'test/base/view_event_test_platform_part_chromeos.cc',
       'test/base/view_event_test_platform_part_default.cc',
       'test/ppapi/ppapi_interactive_browsertest.cc',
     ],
     # Panels sources not related to UI toolkit. ChromeOS doesn't use panels.
     'chrome_interactive_ui_test_panels_sources': [
       'browser/ui/panels/detached_panel_browsertest.cc',
@@ skipping 13 matching lines @@
       'browser/ui/views/menu_controller_interactive_uitest.cc',
       'browser/ui/views/menu_item_view_interactive_uitest.cc',
       'browser/ui/views/menu_model_adapter_test.cc',
       'browser/ui/views/menu_test_base.cc',
       'browser/ui/views/menu_test_base.h',
       'browser/ui/views/menu_view_drag_and_drop_test.cc',
       'browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc',
       'test/base/view_event_test_base.cc',
       'test/base/view_event_test_base.h',
     ],
+    # Mac sources, except when mac_views_browser==1.
+    'chrome_interactive_ui_test_cocoa_sources': [
+      'browser/ui/cocoa/translate/translate_bubble_test_utils_cocoa.mm',
+      'test/base/interactive_test_utils_cocoa.mm',
+      # Cocoa depended tests.

[tapted, 2016/02/07 23:15:30]

nit: remove comment && sort. I don't think
browser_action_button_interactive_uitest needs special treatment -- it's tightly
coupled to the Cocoa-based browser window, so when mac_views_browser substitutes
a toolkit-views based browser the test won't be needed

[themblsha, 2016/02/08 17:08:58]

Done.

+      'browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm',
+    ],
     'chrome_interactive_ui_test_app_list_sources': [
       'browser/ui/app_list/app_list_service_interactive_uitest.cc',
       'browser/ui/app_list/app_list_service_mac_interactive_uitest.mm',
     ],
     'chrome_interactive_ui_test_win_sources': [
       '../ui/resources/cursors/aliasb.cur',
       '../ui/resources/cursors/cell.cur',
       '../ui/resources/cursors/col_resize.cur',
       '../ui/resources/cursors/copy.cur',
       '../ui/resources/cursors/none.cur',
@@ skipping 24 matching lines @@
       'browser/ui/views/location_bar/star_view_browsertest.cc',
       'browser/ui/views/omnibox/omnibox_view_views_browsertest.cc',
       'browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc',
       'browser/ui/views/passwords/manage_passwords_icon_view_interactive_uitest.cc',
       'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
       'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
       'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h',
       'browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc',
       'browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc',
       'browser/ui/views/translate/translate_bubble_test_utils_views.cc',
+      'test/base/interactive_test_utils_views.cc',
     ],
     'chrome_interactive_ui_test_notifications_sources': [
       'browser/extensions/api/notifications/notifications_apitest.cc',
       'browser/notifications/message_center_notifications_browsertest.cc',
     ],
     'chrome_interactive_ui_test_chromeos_sources': [
       '../ash/accelerators/accelerator_interactive_uitest_chromeos.cc',
       'browser/chromeos/accessibility/magnification_controller_browsertest.cc',
       'browser/chromeos/accessibility/speech_monitor.cc',
       'browser/chromeos/accessibility/speech_monitor.h',
@@ skipping 530 matching lines @@
           'dependencies': [
             '../ash/ash.gyp:ash_interactive_ui_test_support',
           ],
         }],
         ['OS=="mac"', {
           'dependencies': [
             'chrome'
           ],
           # See comment about the same line in chrome/chrome_tests.gypi.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
+          'conditions' : [
+            # The browser window can be views or Cocoa on Mac. Test accordingly.
+            ['mac_views_browser==1', {
+              'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources)' ],
+              # Following tests needs a refactoring to works with mac_views.
+              'sources!': [
+                # Aura depended tests.
+                'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
+                'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
+              ]
+            }, {
+              'sources': [ '<@(chrome_interactive_ui_test_cocoa_sources)' ],
+            }],  # mac_views_browser==1
+          ],
         }, {  # Non-Mac.
           'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources)' ],
         }],
         ['notifications == 1', {
           # Common notifications tests.
           'sources': [
             '<@(chrome_interactive_ui_test_notifications_sources)',
           ],
           'conditions': [
             ['chromeos == 1', {
@@ skipping 1771 matching lines @@
             'browser',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }