roll up of misc. gn work

chrome/browser/ui/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")
 
 gypi_values = exec_script("//build/gypi_to_gn.py",
                           [ rebase_path("../../chrome_browser_ui.gypi") ],
@@ skipping 150 matching lines @@
                     "//chrome")
   }
   if (enable_task_manager) {
     sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources,
                            ".",
                            "//chrome")
     if (!toolkit_views || is_mac) {
       sources -= [ "views/task_manager_view.cc" ]
     }
   }
-  if (!enable_nacl) {
+  if (enable_nacl) {
     sources +=
         rebase_path(gypi_values.chrome_browser_ui_nacl_sources, ".", "//chrome")
-    deps += [
-      #"//native_client/src/trusted/service_runtime/service_runtime.gyp:sel",  TODO(GYP)
-    ]
+    deps += [ "//native_client/src/trusted/service_runtime:sel" ]
   }
   if (enable_configuration_policy) {
     sources += rebase_path(gypi_values.chrome_browser_ui_policy_sources,
                            ".",
                            "//chrome")
     deps += [ "//components/policy" ]
   }
   if (enable_plugins) {
     sources += rebase_path(gypi_values.chrome_browser_ui_plugin_sources,
                            ".",
@@ skipping 341 matching lines @@
     "//chrome/browser",
     "//content/public/browser",
     "//content/public/common",
     "//content/test:test_support",
     "//net:test_support",
     "//skia",
     "//testing/gtest",
     "//ui/base",
   ]
 }