roll up of misc. gn work

chrome/browser/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/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//components/nacl/nacl_defines.gni")
 
 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
@@ skipping 345 matching lines @@
   }
   if (enable_spellcheck) {
     sources += rebase_path(gypi_values.chrome_browser_spellchecker_sources,
                            ".",
                            "//chrome")
     deps += [ "//third_party/hunspell" ]
   }
   if (enable_nacl) {
     sources +=
         rebase_path(gypi_values.chrome_browser_nacl_sources, ".", "//chrome")
-    #deps += [ "//components/nacl:nacl_browser" ]  TODO(GYP)
+    deps += [ "//components/nacl:nacl_browser" ]
   }
 
   if (enable_configuration_policy) {
     sources +=
         rebase_path(gypi_values.chrome_browser_policy_shared_with_ios_sources,
                     ".",
                     "//chrome")
     deps += [
       "//components/policy",
       "//components/policy/proto",
@@ skipping 735 matching lines @@
     ]
   }
 
   if (enable_wifi_bootstrapping) {
     sources += [
       "local_discovery/wifi/mock_wifi_manager.cc",
       "local_discovery/wifi/mock_wifi_manager.h",
     ]
   }
 }