Prepare for building with enable_app_list=0 on Desktop

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': {
     'build_angle_deqp_tests%': 0,
     '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',
@@ skipping 648 matching lines @@
     ],
     # 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_non_client_frame_view_browsertest_win.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/Cocoa) views browser tests. Excluded on Mac
-    # unless building with mac_views_browser=1. Assumes app list is enabled (as
-    # for chrome_browser_ui_views_non_mac_sources).
+    # unless building with mac_views_browser=1.
     'chrome_browser_tests_views_non_mac_sources': [
-      # 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',
@@ skipping 233 matching lines @@
     'chrome_browser_tests_supervised_user_sources': [
       'browser/supervised_user/supervised_user_browsertest.cc',
       'browser/supervised_user/supervised_user_resource_throttle_browsertest.cc',
       'browser/supervised_user/supervised_user_service_browsertest.cc',
     ],
     'chrome_browser_tests_app_list_sources': [
       'browser/apps/drive/drive_app_converter_browsertest.cc',
       'browser/apps/drive/drive_app_provider_browsertest.cc',
       'browser/ui/app_list/app_list_controller_browsertest.cc',
       'browser/ui/app_list/app_list_service_impl_browsertest.cc',
+      'browser/ui/app_list/app_list_service_views_browsertest.cc',
       'browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc',
       'browser/ui/app_list/speech_recognizer_browsertest.cc',
     ],
     'chrome_browser_tests_service_discovery_sources': [
       'browser/extensions/api/mdns/mdns_apitest.cc',
     ],
     'chrome_browser_tests_media_router_sources': [
       'browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc',
       'test/data/webui/media_router/media_router_elements_browsertest.js',
       'test/media_router/media_router_base_browsertest.cc',
@@ skipping 1707 matching lines @@
             'browser/copresence/chrome_whispernet_client_browsertest.cc',
           ],
           'dependencies': [
             '../components/components.gyp:copresence',
             # build time dependency.
             '../v8/src/d8.gyp:d8#host',
           ],
         }],
         ['enable_app_list==1', {
           'sources': [ '<@(chrome_browser_tests_app_list_sources)' ],
+          'conditions': [
+            ['OS=="mac"', {
+              'sources!': [
+                # This assumes the AppList is views-based.

[Devlin, 2016/05/05 16:01:36]

I'm confused - shouldn't this be in a toolkit views condition rather than an OS
mac condition then?

[tapted, 2016/05/06 02:36:56]

Clarified the comment:

                 # This assumes the AppList is views-based, but Mac only links
                 # browser parts for the Cocoa implementation.

(i.e. the tests will fail since the AppListService alward returns the Cocoa app
list).

+                'browser/ui/app_list/app_list_service_views_browsertest.cc',

[Devlin, 2016/05/05 16:01:36]

Also, if this browsertest depends on views, shouldn't it be in ui/views?

[tapted, 2016/05/06 02:36:56]

now enable_app_list \implies{} toolkit_views==1. Even on Mac - toolkit_views
exists there, but it's not used for all UI. (before the latest changes
chromecast complicated things, relying on a separate toolkit_views check in some
places, but that's now simplified).

+              ],
+            }],
+          ],
         }, {
           'sources!': [ 'browser/ui/webui/app_list/start_page_browsertest.js' ],
         }],
         ['enable_service_discovery==1', {
           'sources': [ '<@(chrome_browser_tests_service_discovery_sources)' ],
         }],
         ['enable_supervised_users==1', {
           'sources': [ '<@(chrome_browser_tests_supervised_user_sources)' ],
         }],
         ['enable_pepper_cdms==1', {
@@ skipping 216 matching lines @@
         'test_support_common',
         '../base/base.gyp:base',
         '../components/components.gyp:invalidation_impl',
         '../components/components.gyp:invalidation_test_support',
         '../content/content_shell_and_tests.gyp:content_browser_test_base',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
         '../sync/sync.gyp:test_support_sync_fake_server',
         '../sync/sync.gyp:test_support_sync_testserver',
-        '../ui/app_list/app_list.gyp:app_list_test_support',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
         '<(protoc_out_dir)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
           '<(INTERMEDIATE_DIR)',
@@ skipping 19 matching lines @@
         }],
         ['chromeos==0', {
           # Note: this list is duplicated in the GN build.
           'sources!': [
             'browser/sync/test/integration/wifi_credentials_helper.cc',
             'browser/sync/test/integration/wifi_credentials_helper.h',
             # 'browser/sync/test/integration/wifi_credentials_helper_chromeos.cc',
             # 'browser/sync/test/integration/wifi_credentials_helper_chromeos.h',
           ],
         }],
-        ['enable_app_list==0', {
+        ['enable_app_list==1', {
+          'dependencies' : [
+            '../ui/app_list/app_list.gyp:app_list_test_support',
+          ],
+        }, {
           # Note: this list is duplicated in the GN build.
           'sources!': [
             'browser/sync/test/integration/sync_app_list_helper.cc',
             'browser/sync/test/integration/sync_app_list_helper.h',
           ],
         }],
       ]
     },
     {
       # GN version: //chrome/test:sync_integration_tests
@@ skipping 651 matching lines @@
             'browser',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }