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

chrome/chrome_common.gypi

Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 5368c96bb5219d6b4167180ff35a657a983e713f..5cdae7ee1f7256b6249e9203ea45be662567c4dc 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -103,6 +103,8 @@
       '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',
@@ -361,6 +363,7 @@
             '<(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',
@@ -384,6 +387,7 @@
             ['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_'],
@@ -403,15 +407,6 @@
             '<(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',
@@ -444,17 +439,18 @@
         }],
         ['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',