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

chrome/chrome_common.gypi

 # Copyright (c) 2013 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': {
     'chrome_common_sources': [
       '../apps/app_shim/app_shim_launch.h',
       '../apps/app_shim/app_shim_messages.h',
       'common/all_messages.h',
@@ skipping 85 matching lines @@
       'common/extensions/manifest_handlers/app_launch_info.cc',
       'common/extensions/manifest_handlers/app_launch_info.h',
       'common/extensions/manifest_handlers/automation.h',
       'common/extensions/manifest_handlers/automation.cc',
       'common/extensions/manifest_handlers/content_scripts_handler.cc',
       'common/extensions/manifest_handlers/content_scripts_handler.h',
       'common/extensions/manifest_handlers/mime_types_handler.cc',
       'common/extensions/manifest_handlers/mime_types_handler.h',
       'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc',
       'common/extensions/manifest_handlers/minimum_chrome_version_checker.h',
+      'common/extensions/manifest_handlers/nacl_modules_handler.cc',
+      'common/extensions/manifest_handlers/nacl_modules_handler.h',
       'common/extensions/manifest_handlers/settings_overrides_handler.cc',
       'common/extensions/manifest_handlers/settings_overrides_handler.h',
       'common/extensions/manifest_handlers/synthesize_browser_action_handler.cc',
       'common/extensions/manifest_handlers/synthesize_browser_action_handler.h',
       'common/extensions/manifest_handlers/theme_handler.cc',
       'common/extensions/manifest_handlers/theme_handler.h',
       'common/extensions/manifest_handlers/ui_overrides_handler.cc',
       'common/extensions/manifest_handlers/ui_overrides_handler.h',
       'common/extensions/manifest_url_handler.cc',
       'common/extensions/manifest_url_handler.h',
@@ skipping 238 matching lines @@
           ],
         }],
         ['OS != "ios"', {
           'dependencies': [
             '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
             '<(DEPTH)/components/components.gyp:autofill_core_common',
             '<(DEPTH)/components/components.gyp:autofill_content_common',
             '<(DEPTH)/components/components.gyp:password_manager_core_common',
             '<(DEPTH)/components/components.gyp:signin_core_common',
             '<(DEPTH)/components/components.gyp:translate_content_common',
+            '<(DEPTH)/components/nacl.gyp:nacl_common',
             '<(DEPTH)/components/components.gyp:visitedlink_common',
             '<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
             '<(DEPTH)/extensions/extensions.gyp:extensions_common',
             '<(DEPTH)/ipc/ipc.gyp:ipc',
             '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',
             '<(DEPTH)/third_party/re2/re2.gyp:re2',
             '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
           ],
           'export_dependent_settings': [
             '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
           ],
         }, {  # OS == ios
           'sources/': [
             ['exclude', '^common/child_process_'],
             ['exclude', '^common/chrome_content_client\\.cc$'],
             ['exclude', '^common/chrome_version_info_posix\\.cc$'],
             ['exclude', '^common/common_message_generator\\.cc$'],
             ['exclude', '^common/common_param_traits'],
             ['exclude', '^common/custom_handlers/'],
             ['exclude', '^common/extensions/'],
             ['exclude', '^common/logging_chrome\\.'],
             ['exclude', '^common/media_galleries/'],
             ['exclude', '^common/multi_process_'],
+            ['exclude', '^common/nacl_'],
             ['exclude', '^common/pepper_flash\\.'],
             ['exclude', '^common/profiling\\.'],
             ['exclude', '^common/spellcheck_'],
             ['exclude', '^common/validation_message_'],
             ['exclude', '^common/web_apps\\.'],
             # TODO(ios): Include files here as they are made to work; once
             # everything is online, remove everything below here and just
             # use the exclusions above.
             ['exclude', '\\.(cc|mm)$'],
             ['include', '_ios\\.(cc|mm)$'],
             ['include', '(^|/)ios/'],
             ['include', '^common/chrome_version_info\\.cc$'],
             ['include', '^common/translate'],
             ['include', '^common/zip'],
           ],
           'include_dirs': [
             '<(DEPTH)/breakpad/src',
           ],
         }],
-        ['disable_nacl==0', {
-          'dependencies': [
-            '<(DEPTH)/components/nacl.gyp:nacl_common',
-          ],
-          'sources': [
-            'common/extensions/manifest_handlers/nacl_modules_handler.cc',
-            'common/extensions/manifest_handlers/nacl_modules_handler.h',
-          ],
-        }],
         ['enable_printing==0', {
           'sources!': [
             'common/print_messages.cc',
             'common/print_messages.h',
           ]
         }, {
           'dependencies': [
             '<(DEPTH)/printing/printing.gyp:printing',
           ],
         }],
@@ skipping 12 matching lines @@
            ]
         }],
         ['enable_mdns==1', {
           'sources' : [
             'common/local_discovery/service_discovery_client_impl.cc',
             'common/local_discovery/service_discovery_client_impl.h',
           ]
         }],
         ['OS=="android"', {
           'sources/': [
+            ['exclude', '^common/chrome_version_info_posix.cc'],
             ['exclude', '^common/importer/'],
             ['exclude', '^common/media_galleries/'],
             ['exclude', '^common/service_'],
           ],
           'sources!': [
             'common/badge_util.cc',
-            'common/chrome_version_info_posix.cc',
             'common/extensions/api/extension_action/browser_action_handler.cc',
             'common/extensions/api/extension_action/page_action_handler.cc',
             'common/extensions/api/spellcheck/spellcheck_handler.cc',
             'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc',
+            'common/extensions/manifest_handlers/nacl_modules_handler.cc',
             'common/icon_with_badge_image_source.cc',
             'common/net/url_util.cc',
             'common/spellcheck_common.cc',
           ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/breakpad/src',
             '<(DEPTH)/third_party/wtl/include',
           ],
@@ skipping 224 matching lines @@
         'common/safe_browsing/csd.proto'
       ],
       'variables': {
         'proto_in_dir': 'common/safe_browsing',
         'proto_out_dir': 'chrome/common/safe_browsing',
       },
       'includes': [ '../build/protoc.gypi' ],
     },
   ],
 }