gn BUILD fixes for disabling enable_extensions and use_ash feature flags.

BUILD.gn

 # Copyright (c) 2013 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 is the root build file for GN. GN will start processing by loading this
 # file, and recursively load all dependencies until all dependencies are either
 # resolved or known not to exist (which will cause the build to fail). So if
 # you add a new build file, there must be some path of dependencies from this
 # file to your new one or GN won't know about it.
 
@@ skipping 126 matching lines @@
     ]
   }
 
   if (!is_ios && !is_android && !is_chromecast) {
     deps += [
       "//chrome",
       "//chrome/test:browser_tests",
       "//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",
       "//jingle:jingle_unittests",
       "//net:hpack_example_generator",
       "//net:hpack_fuzz_mutator",
       "//net:hpack_fuzz_wrapper",
       "//ppapi:ppapi_unittests",
       "//ppapi/examples/2d",
       "//ppapi/examples/audio",
       "//ppapi/examples/audio_input",
       "//ppapi/examples/compositor",
@@ skipping 86 matching lines @@
       "//ios/testing:ocmock_support_unittest",
       "//ios/third_party/earl_grey",
       "//ios/web:ios_web_inttests",
       "//ios/web:ios_web_unittests",
       "//ios/web/shell:ios_web_shell",
     ]
   }
 
   deps += root_extra_deps
 
-  if (enable_extensions) {
-    deps += [ "//extensions/shell:app_shell_unittests" ]
-  }

[Dirk Pranke, 2016/05/12 02:01:00]

I would leave this block in, and move lines 147 and 148 here.

-
   if (enable_media_router) {
     deps += [ "//chrome/browser/media/router" ]
   }
 
   if (enable_remoting) {
     deps += [ "//remoting:remoting_all" ]
   }
 
   if (toolkit_views) {
     deps += [ "//ui/views:views_unittests" ]
   }
 
   if (use_aura) {
     deps += [
-      "//ash:ash_shell_with_content",
-      "//ash:ash_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",
+      ]
+    }
   }
 
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   }
 
   if (use_x11) {
     deps += [ "//tools/xdisplaycheck" ]
   }
 
@@ skipping 188 matching lines @@
       ]
     }
     if (!is_android && !is_linux) {
       # TODO(dpranke): Re-enable this once
       # https://chromium-review.googlesource.com/#/c/312298/1 is rolled
       # into chromium.
       deps += [ "//third_party/angle/src/tests:angle_end2end_tests" ]
     }
 
     if (enable_extensions) {
-      deps += [ "//extensions/shell:app_shell" ]

[Dirk Pranke, 2016/05/12 02:01:00]

and move this up into the block on line 256 as well.

+      deps += [
+        "//extensions:extensions_browsertests",
+        "//extensions:extensions_unittests",
+        "//extensions/shell:app_shell",
+        "//extensions/shell:app_shell_unittests",
+      ]
     }
 
     if (enable_nacl) {
       deps += [ "//components/nacl/loader:nacl_loader_unittests" ]
 
       if (is_linux) {
         # TODO(dpranke): Figure out what platforms should actually have this.
         deps += [
           "//components/nacl/loader:helper_nonsfi",
           "//components/nacl/loader:nacl_helper",
@@ skipping 145 matching lines @@
 
   if (!is_android && !is_ios && !is_chromeos) {
     deps += [ "//components/proximity_auth:proximity_auth_unittests" ]
   }
 
   if (is_win || is_linux) {
     deps += [
       "//components/mus/demo",
       "//components/mus/ws:tests",
       "//components/resource_provider:resource_provider_unittests",
-      "//mash:all",
       "//media/mojo/services:media_mojo_shell_unittests",
       "//mojo",
       "//ui/views/mus:views_mus_unittests",
     ]
+    if (use_ash) {
+      deps += [ "//mash:all" ]
+    }
   }
 
   if (is_linux && !is_chromeos && !is_chromecast) {
     # TODO(GYP): Figure out if any of these should be in gn_all
     # and figure out how cross-platform they are
     deps += [
       ":gn_mojo_targets",
       "//chrome/browser/resources:extension_resource_demo",
       "//chrome/installer/util:strings",
       "//chrome/tools/convert_dict",
@@ skipping 283 matching lines @@
   assert(target_name != "")  # Mark as used.
   sources = invoker.actual_sources
   assert(
       sources == invoker.actual_sources,
       "Do not use a platform name in your output directory (found \"$root_build_dir\"). http://crbug.com/548283")
 }
 
 assert_valid_out_dir("_unused") {
   actual_sources = [ "$root_build_dir/foo" ]
 }