Address more TOOD(GYP) in GN build.

extensions/shell/BUILD.gn

 # Copyright 2014 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.
 
 import("//extensions/shell/app_shell.gni")
 
 # Technically, this directory should not depend on files from src/chrome, but
 # that's where the VERSION file is. This  should probably all be moved to
 # src/build.
 import("//chrome/version.gni")
@@ skipping 114 matching lines @@
       "//build/win:default_exe_manifest",
       "//extensions:shell_and_test_pak",
     ]
 
     if (is_win) {
       configs += [ "//build/config/win:windowed" ]
       configs -= [ "//build/config/win:console" ]
     }
 
     if (is_mac) {
-      # TODO(GYP) bug 546894: Fix GN and toolchains to handle spaces here.
-      #output_name = "App Shell"
+      output_name = "App Shell"
+
       # TODO(GYP): Mac bundling. See also content_shell which this is basically
       # a copy-paste of.
       deps += [ ":app_shell_framework" ]
+
       # TODO(GYP): Mac app_shell_helper stuff.
     }
   }
 }
 
 test("app_shell_unittests") {
   sources = rebase_path(app_shell_gypi_values.app_shell_unittests_sources,
                         ".",
                         "//extensions/shell")
 
@@ skipping 33 matching lines @@
   if (is_chromeos) {
     deps += [ "//chromeos:test_support_without_gmock" ]
 
     chromeos_sources =
         rebase_path(app_shell_gypi_values.app_shell_unittests_sources_chromeos,
                     ".",
                     "//extensions/shell")
     sources += chromeos_sources
   }
 
-  # TODO(GYP): Enable this when //components/nacl GN is done.
-  if (false) {
-    if (use_nacl) {
-      nacl_sources =
-          rebase_path(app_shell_gypi_values.app_shell_unittests_sources_nacl,
-                      ".",
-                      "//extensions/shell")
-      sources += nacl_sources
-    }
+  if (enable_nacl) {
+    sources +=
+        rebase_path(app_shell_gypi_values.app_shell_unittests_sources_nacl,
+                    ".",
+                    "//extensions/shell")
   }
 }
 
 process_version("version_header") {
   template_file = "common/version.h.in"
   output = "$target_gen_dir/common/version.h"
 }
 
 if (is_mac) {
   # TODO(GYP) this should be a bundle. Lots of other stuff in this target.
   # Should be able to copy content shell framework (this is basically a
   # copy-paste of that target).
   shared_library("app_shell_framework") {
     testonly = true
     sources = [
       "app/shell_main_mac.cc",
       "app/shell_main_mac.h",
     ]
     deps = [
       ":app_shell_lib",
     ]
   }
 }