Revert of Drop NaCl dependencies on platforms where disable_nacl=1.

chrome/common_constants.gyp

Index: chrome/common_constants.gyp
diff --git a/chrome/common_constants.gyp b/chrome/common_constants.gyp
index 9725cada7c488d8503667ab1520fc427b965ebf1..380e075ab606bc079a1ef44a6b637b3000d45312 100644
--- a/chrome/common_constants.gyp
+++ b/chrome/common_constants.gyp
@@ -72,6 +72,7 @@
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../components/components.gyp:bookmarks_common',
+        '../components/nacl.gyp:nacl_switches',
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
       ],
       'target_conditions': [
@@ -80,13 +81,6 @@
           # re-add it in target_conditionals so it's after that exclusion.
           'sources/': [
             ['include', '^common/chrome_paths_mac\\.mm$'],
-          ],
-        }],
-      ],
-      'conditions': [
-        ['disable_nacl==0', {
-          'dependencies': [
-            '../components/nacl.gyp:nacl_switches',
           ],
         }],
       ],