gn BUILD fixes for disabling enable_extensions and use_ash feature flags.

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index b5fbf42320446da4f5319abfe236383a649ecb3a..5e0f35d80da447c0acc2a71167fc0739dab5db6b 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -143,8 +143,6 @@ group("both_gn_and_gyp") {
       "//chrome/test:interactive_ui_tests",
       "//chrome/test:sync_integration_tests",
       "//chrome/test/chromedriver:chromedriver_unittests",
-      "//extensions:extensions_browsertests",
-      "//extensions:extensions_unittests",
       "//gpu/gles2_conform_support:gles2_conform_test",
       "//gpu/khronos_glcts_support:khronos_glcts_test",
       "//jingle:jingle_unittests",
@@ -260,7 +258,12 @@ group("both_gn_and_gyp") {
   deps += root_extra_deps
 
   if (enable_extensions) {
-    deps += [ "//extensions/shell:app_shell_unittests" ]
+    deps += [
+      "//extensions:extensions_browsertests",
+      "//extensions:extensions_unittests",
+      "//extensions/shell:app_shell",
+      "//extensions/shell:app_shell_unittests",
+    ]
   }
 
   if (enable_media_router) {
@@ -277,14 +280,18 @@ group("both_gn_and_gyp") {
 
   if (use_aura) {
     deps += [
-      "//ash:ash_shell_with_content",
-      "//ash:ash_unittests",
       "//ui/app_list:app_list_unittests",
       "//ui/app_list/presenter:app_list_presenter_unittests",
       "//ui/aura:aura_unittests",
       "//ui/aura:demo",
       "//ui/wm:wm_unittests",
     ]
+    if (use_ash) {
+      deps += [
+        "//ash:ash_shell_with_content",
+        "//ash:ash_unittests",
+      ]
+    }

[Dirk Pranke, 2016/05/31 20:09:37]

nit: does this even need to be nested inside use_aura? 

   }
 
   if (use_ozone) {
@@ -490,11 +497,6 @@ group("both_gn_and_gyp") {
       # into chromium.
       deps += [ "//third_party/angle/src/tests:angle_end2end_tests" ]
     }
-
-    if (enable_extensions) {
-      deps += [ "//extensions/shell:app_shell" ]
-    }
-
     if (enable_nacl) {
       deps += [ "//components/nacl/loader:nacl_loader_unittests" ]
 
@@ -650,13 +652,15 @@ group("gn_only") {
     deps += [
       "//components/mus/demo",
       "//components/mus/ws:tests",
-      "//mash:all",
       "//media/mojo/services:media_mojo_shell_unittests",
       "//mojo",
       "//services/navigation",
       "//ui/views/mus:views_mus_interactive_ui_tests",
       "//ui/views/mus:views_mus_unittests",
     ]
+    if (use_ash) {
+      deps += [ "//mash:all" ]

[Ben Goodger (Google), 2016/05/31 20:20:13]

This is incorrect.

use_ash is meant to trigger "in-process ash" (i.e. ash run in the browser
process, main thread), a la ChromeOS today.

without use_ash set, it should still be possible to build the ash lib into a
mojo app apart from chrome, and run chrome in it. (In that out-of-process ash
world, chrome behaves more like the conventional desktop client).

So this target should stay in the deps list it was in originally.

+    }
   }
 
   if (is_linux && !is_chromeos && !is_chromecast) {