Prepare for building with enable_app_list=0 on Desktop

build/gn_migration.gypi

 # Copyright (c) 2015 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.
 
 # This file defines five targets that we are using to track the progress of the
 # GYP->GN migration:
 #
 # 'both_gn_and_gyp' lists what GN is currently capable of building and should
 # match the 'both_gn_and_gyp' target in //BUILD.gn.
 #
@@ skipping 138 matching lines @@
           ],
         }],
         ['remoting==1 and chromeos==0 and use_x11==1', {
           'dependencies': [
             '../remoting/remoting.gyp:remoting_me2me_host',
             '../remoting/remoting.gyp:remoting_me2me_native_messaging_host',
           ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
+            '../ui/views/views.gyp:views_unittests',
+          ],
+        }],
+        ['enable_app_list==1', {
+          'dependencies': [
             '../ui/app_list/app_list.gyp:app_list_demo',
-            '../ui/views/views.gyp:views_unittests',
           ],
         }],
         ['use_ash==1', {
           'dependencies': [
             '../ash/ash.gyp:ash_shell_with_content',
             '../ash/ash.gyp:ash_unittests',
           ],
         }],
         ['use_ash==1 or chromeos== 1', {
           'dependencies': [
@@ skipping 182 matching lines @@
             '../ppapi/ppapi_internal.gyp:ppapi_example_video_decode_dev',
             '../ppapi/ppapi_internal.gyp:ppapi_example_video_effects',
             '../ppapi/ppapi_internal.gyp:ppapi_example_video_encode',
             '../ppapi/ppapi_internal.gyp:ppapi_tests',
             '../ppapi/ppapi_internal.gyp:ppapi_perftests',
             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
             '../sync/sync.gyp:run_sync_testserver',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             '../tools/imagediff/image_diff.gyp:image_diff',
+            '../ui/compositor/compositor.gyp:compositor_unittests',
+          ],
+        }],
+        ['enable_app_list==1', {
+          'dependencies': [
             '../ui/app_list/app_list.gyp:app_list_unittests',
-            '../ui/compositor/compositor.gyp:compositor_unittests',
           ],
         }],
         ['OS!="android" and chromecast==0', {
           'dependencies': [
             '../chrome/chrome.gyp:browser_tests',
             '../chrome/chrome.gyp:chrome',
             '../chrome/chrome.gyp:interactive_ui_tests',
             '../chrome/chrome.gyp:performance_browser_tests',
             '../chrome/chrome.gyp:sync_integration_tests',
             '../chrome/chrome.gyp:sync_performance_tests',
@@ skipping 220 matching lines @@
             '../sql/sql.gyp:sql_unittests_run',
             '../sync/sync.gyp:sync_unit_tests_run',
             '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_heap_unittests_run',
             '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_platform_unittests_run',
             '../third_party/WebKit/Source/web/web_tests.gyp:webkit_unit_tests_run',
             '../third_party/WebKit/Source/wtf/wtf_tests.gyp:wtf_unittests_run',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests_run',
             '../tools/battor_agent/battor_agent.gyp:battor_agent_unittests_run',
             '../tools/gn/gn.gyp:gn_unittests_run',
             '../ui/accessibility/accessibility.gyp:accessibility_unittests_run',
-            '../ui/app_list/app_list.gyp:app_list_unittests_run',
             '../ui/compositor/compositor.gyp:compositor_unittests_run',
             '../ui/display/display.gyp:display_unittests_run',
             '../ui/events/events_unittests.gyp:events_unittests_run',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests_run',
             '../ui/message_center/message_center.gyp:message_center_unittests_run',
             '../url/url.gyp:url_unittests_run',
           ],
           'conditions': [
             ['OS=="linux"', {
               'dependencies': [
@@ skipping 30 matching lines @@
                 '../mojo/mojo_edk_tests.gyp:mojo_js_integration_tests_run',
                 '../mojo/mojo_edk_tests.gyp:mojo_system_unittests_run',
                 '../services/shell/shell.gyp:mojo_shell_unittests_run',
               ],
             }],
             ['use_ash==1', {
               'dependencies': [
                 '../ash/ash.gyp:ash_unittests_run',
               ],
             }],
+            ['enable_app_list==1', {
+              'dependencies': [
+                '../ui/app_list/app_list.gyp:app_list_unittests_run',
+              ],
+            }],
+            ['enable_app_list==1 and use_aura==1', {
+              'dependencies': [
+                '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter_unittests_run',
+              ],
+            }],
             ['use_aura==1', {
               'dependencies': [
-                '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter_unittests_run',
                 '../ui/aura/aura.gyp:aura_unittests_run',
                 '../ui/wm/wm.gyp:wm_unittests_run',
               ],
             }],
             ['enable_webrtc==1 or OS!="android"', {
               'dependencies': [
                 '../jingle/jingle.gyp:jingle_unittests_run',
               ],
             }],
             ['disable_nacl==0 and disable_nacl_untrusted==0', {
@@ skipping 102 matching lines @@
         }],
         ['OS=="android" and target_arch != "x64"', {
           'dependencies': [
             '../third_party/android_platform/relocation_packer.gyp:android_relocation_packer_unittests#host'
           ],
         }],
       ],
     },
   ]
 }