Revert r207951 - "Separate NaCl switches to their own file."

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 64 matching lines @@
           # re-add it in target_conditionals so it's after that exclusion.
           'sources/': [
             ['include', '^common/chrome_paths_mac\\.mm$'],
           ],
         }],
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': ['../build/linux/system.gyp:gtk'],
         }],
-        ['OS != "ios"', {
-          'dependencies': [
-            '../components/nacl_common.gypi: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.
           ],
           'dependencies': [
             '../base/base.gyp:base_nacl_win64',
-            '../components/nacl_common.gypi:nacl_switches_win64',
             '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
           ],
           'defines': [
             '<@(nacl_win64_defines)',
             'COMPILE_CONTENT_STATICALLY',
           ],
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }