roll up of misc. gn work

chrome/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("//build/config/features.gni")
 import("//build/config/locales.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_repack_locales.gni")
 import("//chrome/version.gni")
 
@@ skipping 266 matching lines @@
       "//chrome/renderer",
       "//chrome/utility",
       "//content/public/child",
       "//third_party/WebKit/public:blink_devtools_frontend_resources",
     ]
   }
   if (cld_version == 0 || cld_version == 2) {
     deps += [ "//third_party/cld_2:cld2_platform_impl" ]
   }
 
-  # TODO(gyp) if (enable_nacl) {
-  #  deps += [ "<(DEPTH)/components/nacl/renderer/plugin/plugin.gyp:nacl_trusted_plugin" ]
-  #}
+  if (enable_nacl) {
+    deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ]
+  }
   if (enable_remoting) {
     deps += [ "//remoting/client/plugin" ]
   }
 }
 
 if (is_win) {
   # TODO(brettw) this duplicates "//chrome/common:version" which applies to
   # Linux.
   process_version("version_header") {
     # TODO(brettW) this should have more reduced visibility, but chrome/browser
@@ skipping 392 matching lines @@
       "//chrome/browser/ui",
       "//chrome/child",
       "//chrome/plugin",
       "//chrome/renderer",
       "//chrome/utility",
       "//components/enhanced_bookmarks",
       "//content/public/app:browser",
     ]
   }
 }