Set enable_app_list=1 now only on ChromeOS.

Turn down app_list_unittests on Mac. Moves app_list_unittests and
app_list_presenter_unittests to the same place as ash_unittests on other
non-ChromeOS bots.

BUG=600915

Review-Url: https://codereview.chromium.org/1934213002
Cr-Original-Commit-Position: refs/heads/master@{#394856}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 87ca2d6836730fb7cacf7c76e33e100df599b754

all.gyp

@@ -243,6 +243,7 @@
         ['use_aura==1', {
           'dependencies': [
             '../ash/ash.gyp:*',
+            '../ui/app_list/app_list.gyp:*',
             '../ui/aura/aura.gyp:*',
             '../ui/aura_extra/aura_extra.gyp:*',
           ],
@@ -257,11 +258,6 @@
             '../third_party/boringssl/boringssl_tests.gyp:*',
           ],
         }],
-        ['enable_app_list==1', {
-          'dependencies': [
-            '../ui/app_list/app_list.gyp:*',
-          ],
-        }],
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
             '../google_apis/gcm/gcm.gyp:*',
@@ -460,19 +456,11 @@
             '../printing/printing.gyp:printing_unittests',
           ],
         }],
-        ['enable_app_list==1', {
-          'dependencies': [
-            '../ui/app_list/app_list.gyp:app_list_unittests',
-          ],
-        }],
-        ['enable_app_list==1 and use_aura==1', {
-          'dependencies': [
-            '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter_unittests',
-          ],
-        }],
         ['use_aura==1', {
           'dependencies': [
             '../ash/ash.gyp:ash_unittests',
+            '../ui/app_list/app_list.gyp:app_list_unittests',
+            '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter_unittests',
             '../ui/aura/aura.gyp:aura_unittests',
             '../ui/compositor/compositor.gyp:compositor_unittests',
           ],
@@ -1237,6 +1225,7 @@
             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
             '../skia/skia_tests.gyp:skia_unittests',
+            '../ui/app_list/app_list.gyp:*',
             '../ui/aura/aura.gyp:*',
             '../ui/aura_extra/aura_extra.gyp:*',
             '../ui/base/ui_base_tests.gyp:ui_base_unittests',
@@ -1273,11 +1262,6 @@
                 '../ui/ozone/demo/ozone_demos.gyp:*',
               ],
             }],
-            ['enable_app_list==1', {
-              'dependencies': [
-                '../ui/app_list/app_list.gyp:*',
-              ],
-            }],
             ['chromecast==0', {
               'dependencies': [
                 '../chrome/chrome.gyp:browser_tests',

common.gypi

@@ -258,8 +258,8 @@
             'enable_topchrome_md%': 1,
           }],
 
-          # Enable App Launcher everywhere but mobile.
-          ['OS!="ios" and OS!="android" and chromecast==0', {
+          # Enable App Launcher on ChromeOS only.
+          ['chromeos==1', {
             'enable_app_list%': 1,
           }, {
             'enable_app_list%': 0,

config/features.gni

@@ -57,7 +57,7 @@ declare_args() {
 
   enable_plugin_installation = is_win || is_mac
 
-  enable_app_list = !is_ios && !is_android && !is_chromecast
+  enable_app_list = is_chromeos
 
   enable_supervised_users = !is_ios