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

chrome/common_constants.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
 
   'includes': [
@@ skipping 54 matching lines @@
       # GN version: //chrome/common:constants
       'target_name': 'common_constants',
       'type': 'static_library',
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)',  # Needed by chrome_paths.cc.
       ],
       'dependencies': [
         '../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': [
         ['OS=="ios"', {
           # iOS needs chrome_paths_mac, which is excluded by filename rules;
           # 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',
-          ],
-        }],
-      ],
     },
   ],
   'conditions': [
     ['OS=="win" and target_arch=="ia32"', {
       'targets': [
         {
           'target_name': 'common_constants_win64',
           'type': 'static_library',
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)',  # Needed by chrome_paths.cc.
@@ skipping 11 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }