Prepare for building with enable_app_list=0 on Desktop

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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_unit_tests_sources': [
       # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
       # dependency is needed to make commit bots run unit_tests on
       # histograms.xml changes.
       '../tools/metrics/histograms/histograms.xml',
@@ skipping 381 matching lines @@
     'chrome_unit_tests_extensions_sources': [
       '../apps/saved_files_service_unittest.cc',
       '../components/drive/drive_api_util_unittest.cc',
       '../components/drive/drive_app_registry_unittest.cc',
       '../components/drive/drive_uploader_unittest.cc',
       '../components/drive/event_logger_unittest.cc',
       '../components/drive/service/drive_api_service_unittest.cc',
       '../components/drive/service/fake_drive_service_unittest.cc',
       'browser/apps/app_shim/app_shim_host_mac_unittest.cc',
       'browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc',
-      'browser/apps/drive/drive_app_mapping_unittest.cc',
       'browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc',
       'browser/extensions/active_tab_unittest.cc',
       'browser/extensions/activity_log/activity_database_unittest.cc',
       'browser/extensions/activity_log/activity_log_enabled_unittest.cc',
       'browser/extensions/activity_log/activity_log_policy_unittest.cc',
       'browser/extensions/activity_log/activity_log_unittest.cc',
       'browser/extensions/activity_log/counting_policy_unittest.cc',
       'browser/extensions/activity_log/database_string_table_unittest.cc',
       'browser/extensions/activity_log/fullstream_ui_policy_unittest.cc',
       'browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc',
@@ skipping 933 matching lines @@
     # TODO(tapted): Enable toolkit-views unit_tests on Mac when their
     # respective implementations are linked in. http://crbug.com/412234.
     'chrome_unit_tests_views_sources': [
       '../ui/views/controls/webview/webview_unittest.cc',
       'browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc',
       'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc',
       'browser/ui/views/website_settings/website_settings_popup_view_unittest.cc',
     ],
     # Views unit_tests for everywhere but ChromeOS.
     'chrome_unit_tests_views_non_chromeos_sources': [
-      'browser/ui/views/app_list/linux/app_list_linux_unittest.cc',
       'browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc',
       'browser/ui/views/sync/one_click_signin_dialog_view_unittest.cc',
     ],
-    # Cross-platform (except Mac) views unit tests. Assumes app list is enabled.
+    # Cross-platform (except Mac) views unit tests.
     'chrome_unit_tests_views_non_mac_sources': [
       'browser/ui/views/accelerator_table_unittest.cc',
-      # Views implies app list is enabled (only disabled on mobile).
-      'browser/ui/views/app_list/win/app_list_win_unittest.cc',
       'browser/ui/views/apps/shaped_app_window_targeter_unittest.cc',
       'browser/ui/views/autofill/autofill_dialog_views_unittest.cc',
       'browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc',
       'browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc',
       'browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc',
       'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc',
       'browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc',
       'browser/ui/views/confirm_bubble_views_unittest.cc',
       'browser/ui/views/crypto_module_password_dialog_view_unittest.cc',
       'browser/ui/views/desktop_media_picker_views_unittest.cc',
@@ skipping 236 matching lines @@
       'browser/media/native_desktop_media_list_unittest.cc',
       'browser/signin/cross_device_promo_unittest.cc',
       'browser/signin/signin_global_error_unittest.cc',
       'browser/sync/sync_global_error_unittest.cc',
       'browser/ui/webui/signin/signin_create_profile_handler_unittest.cc',
       'browser/ui/webui/signin/signin_supervised_user_import_handler_unittest.cc',
       'browser/ui/webui/signin/sync_confirmation_handler_unittest.cc',
       'browser/upgrade_detector_impl_unittest.cc',
     ],
     'chrome_unit_tests_app_list_sources': [
+      'browser/apps/drive/drive_app_mapping_unittest.cc',
       'browser/ui/app_list/app_context_menu_unittest.cc',
       'browser/ui/app_list/app_list_positioner_unittest.cc',
       'browser/ui/app_list/app_list_service_mac_unittest.mm',
       'browser/ui/app_list/app_list_service_unittest.cc',
       'browser/ui/app_list/app_list_shower_views_unittest.cc',
       'browser/ui/app_list/app_list_test_util.cc',
       'browser/ui/app_list/app_list_test_util.h',
       'browser/ui/app_list/extension_app_model_builder_unittest.cc',
       'browser/ui/app_list/model_pref_updater_unittest.cc',
       'browser/ui/app_list/profile_loader_unittest.cc',
       'browser/ui/app_list/search/app_search_provider_unittest.cc',
       'browser/ui/app_list/search/history_unittest.cc',
       'browser/ui/app_list/search/omnibox_result_unittest.cc',
       'browser/ui/app_list/search/suggestions/suggestions_search_provider_unittest.cc',
       'browser/ui/app_list/speech_auth_helper_unittest.cc',
       'browser/ui/app_list/test/fake_profile.cc',
       'browser/ui/app_list/test/fake_profile.h',
       'browser/ui/app_list/test/fake_profile_store.cc',
       'browser/ui/app_list/test/fake_profile_store.h',
       'browser/ui/app_list/test/fast_show_pickler_unittest.cc',
+      'browser/ui/views/app_list/linux/app_list_linux_unittest.cc',
+      'browser/ui/views/app_list/win/app_list_win_unittest.cc',
     ],
     # ChromeOS only sources of app_list.
     'chrome_unit_tests_app_list_chromeos_sources': [
       'browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_unittest.cc',
       'browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc',
     ],
     # ARC only sources of app_list.
     'chrome_unit_tests_app_list_chromeos_arc_sources': [
       'browser/ui/app_list/arc/arc_app_test.cc',
       'browser/ui/app_list/arc/arc_app_test.h',
@@ skipping 1090 matching lines @@
         ['safe_browsing==1 and enable_extensions==1', {
           'sources': [
             'browser/extensions/blacklist_unittest.cc',
           ],
         }],
         ['enable_app_list==1', {
           'sources': [ '<@(chrome_unit_tests_app_list_sources)' ],
           'dependencies': [
             '../ui/app_list/app_list.gyp:app_list_test_support',
           ],
-        }],
-        ['enable_app_list==1 and chromeos==1', {
-          'sources': [ '<@(chrome_unit_tests_app_list_chromeos_sources)' ],
+          'conditions': [
+            ['chromeos==1', {
+              'sources': [ '<@(chrome_unit_tests_app_list_chromeos_sources)' ],
+              'sources!': [
+                'browser/ui/views/app_list/linux/app_list_linux_unittest.cc',
+              ],
+            }],
+            ['OS=="mac"', {
+              'sources!': [
+                # This assumes the AppList is views-based.
+                'browser/ui/app_list/app_list_shower_views_unittest.cc',
+              ],
+            }],
+          ],
         }],
         ['enable_app_list==1 and chromeos==1', {
           'sources': [ '<@(chrome_unit_tests_app_list_chromeos_arc_sources)' ],
           'dependencies': [
             '../components/components.gyp:arc_test_support',
           ],
         }],
         ['chromeos==1', {
           'sources': [ '<@(chrome_unit_tests_arc_sources)' ],
           'dependencies': [
@@ skipping 241 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }