roll up of misc. gn work

extensions/shell/BUILD.gn

Index: extensions/shell/BUILD.gn
diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn
index a251765c0ee4aa54f1577f6b0a5b8d952f4083f5..3a3148d6199a3d377822084e34df3e6a9c832863 100644
--- a/extensions/shell/BUILD.gn
+++ b/extensions/shell/BUILD.gn
@@ -7,6 +7,7 @@
 # src/build.
 import("//chrome/version.gni")
 import("//tools/grit/grit_rule.gni")
+import("//components/nacl/nacl_defines.gni")
 
 assert(enable_extensions)
 
@@ -140,6 +141,7 @@ source_set("app_shell_lib") {
     "utility/shell_content_utility_client.cc",
     "utility/shell_content_utility_client.h",
   ]
+
   if (is_chromeos) {
     deps += [
       "//chromeos",
@@ -152,6 +154,28 @@ source_set("app_shell_lib") {
       "browser/api/vpn_provider/vpn_service_factory.cc",
     ]
   }
+
+  if (enable_nacl) {
+    sources += [
+      "browser/shell_nacl_browser_delegate.cc",
+      "browser/shell_nacl_browser_delegate.h",
+    ]
+
+    defines = nacl_defines
+
+    deps += [
+      "//components/nacl",
+      "//components/nacl:nacl_browser",
+      "//components/nacl:nacl_common",
+      "//components/nacl:nacl_renderer",
+      "//components/nacl:nacl_switches",
+      "//components/nacl/renderer/plugin:nacl_trusted_plugin",
+    ]
+
+    if (is_linux) {
+      deps += [ "//components/nacl:nacl_helper" ]
+    }
+  }
 }
 
 if (!(is_chromeos && !use_ozone) && (!is_win || link_chrome_on_windows)) {