Drop NaCl dependencies on platforms where disable_nacl=1.

chrome/common/BUILD.gn

Index: chrome/common/BUILD.gn
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 49e7552b3e9274b992ac7c0d2dfc877afbf27c77..6c5a86edb4259d91be8204932fc30fb6072d4983 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -76,12 +76,21 @@ static_library("common") {
       "//third_party/widevine/cdm:version_h",
       #'<(DEPTH)/components/components.gyp:password_manager_core_common',  TODO(GYP)
       #'<(DEPTH)/components/components.gyp:signin_core_common',  TODO(GYP)
-      #'<(DEPTH)/components/nacl.gyp:nacl_common',  TODO(GYP)
       #'<(DEPTH)/extensions/common/api/api.gyp:extensions_api',  TODO(GYP)
       #'<(DEPTH)/extensions/extensions.gyp:extensions_common',  TODO(GYP)
     ]
   }
 
+  if (enable_nacl) {
+    deps += [
+      #'<(DEPTH)/components/nacl.gyp:nacl_common',  TODO(GYP)
+    ]
+    sources += [
+      "extensions/manifest_handlers/nacl_modules_handler.cc",
+      "extensions/manifest_handlers/nacl_modules_handler.h",
+    ]
+  }
+
   if (safe_browsing_mode == 1) {
     defines += [ "FULL_SAFE_BROWSING" ]
     sources += rebase_path(
@@ -163,8 +172,12 @@ static_library("constants") {
     "//base",
     "//base/third_party/dynamic_annotations",
     "//third_party/widevine/cdm:version_h",
-    # TODO(GYP)
-    #'../components/components.gyp:bookmarks_common',
-    #'../components/nacl.gyp:nacl_switches',
+    #'../components/components.gyp:bookmarks_common',  TODO(GYP)
   ]
+
+  if (enable_nacl) {
+    deps += [
+      #'../components/nacl.gyp:nacl_switches',  TODO(GYP)
+    ]
+  }
 }