roll up of misc. gn work

chrome/app/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("//tools/grit/grit_rule.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
   android_generated_java_resources = [
     "java/res/values-am/generated_resources.xml",
@@ skipping 304 matching lines @@
   ]
 
   if (is_mac) {
     sources += [
       "chrome_breakpad_client.cc",
       "chrome_breakpad_client_mac.mm",
       "chrome_main_mac.mm",
     ]
   }
 
-  # TODO(gyp) if (enable_plugins and enable_nacl) {
-  #  deps += [ "'<(DEPTH)/components/nacl/renderer/plugin/plugin.gyp:nacl_trusted_plugin'," ]
-  # }
+  if (enable_plugins && enable_nacl) {
+    deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ]
+  }
 
   if (enable_remoting) {
     deps += [ "//remoting/client/plugin" ]
   }
 }