Prepare for building with enable_app_list=0 on Desktop

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index cf34b0e3fe44d69baf55c62842b536ab7ebc5c75..c1945d9de14960e3a56cd68597ef06a02a2aa1c9 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -666,12 +666,8 @@
       '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.
@@ -925,6 +921,7 @@
       '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',
     ],
@@ -2652,6 +2649,14 @@
         }],
         ['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' ],
         }],
@@ -2888,7 +2893,6 @@
         '../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': [
         '..',
@@ -2928,7 +2932,11 @@
             # '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',