Move more files from chrome/browser/nacl_host/ to components/nacl/browser/

components/nacl.gyp

Index: components/nacl.gyp
diff --git a/components/nacl.gyp b/components/nacl.gyp
index 21fce7901b79661540a8ef220eadb25ce0c4ad95..6d7e520182989b40db9956c48cd1491cdb2e47ed 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -40,7 +40,6 @@
           'nacl/loader/nacl_validation_db.h',
           'nacl/loader/nacl_validation_query.cc',
           'nacl/loader/nacl_validation_query.h',
-          'nacl/browser/test_nacl_browser_delegate.cc',
         ],
         # TODO(gregoryd): consider switching NaCl to use Chrome OS defines
         'conditions': [
@@ -103,16 +102,39 @@
           'target_name': 'nacl_browser',
           'type': 'static_library',
           'sources': [
+            'nacl/browser/nacl_broker_host_win.cc',
+            'nacl/browser/nacl_broker_host_win.h',
+            'nacl/browser/nacl_broker_service_win.cc',
+            'nacl/browser/nacl_broker_service_win.h',
             'nacl/browser/nacl_browser.cc',
             'nacl/browser/nacl_browser.h',
+            'nacl/browser/nacl_file_host.cc',
+            'nacl/browser/nacl_file_host.h',
+            'nacl/browser/nacl_host_message_filter.cc',
+            'nacl/browser/nacl_host_message_filter.h',
+            'nacl/browser/nacl_process_host.cc',
+            'nacl/browser/nacl_process_host.h',
             'nacl/browser/nacl_validation_cache.cc',
             'nacl/browser/nacl_validation_cache.h',
+            'nacl/browser/pnacl_host.cc',
+            'nacl/browser/pnacl_host.h',
             'nacl/browser/pnacl_translation_cache.cc',
             'nacl/browser/pnacl_translation_cache.h',
+            'nacl/common/nacl_debug_exception_handler_win.cc',
+            'nacl/common/nacl_debug_exception_handler_win.h',
           ],
           'include_dirs': [
             '..',
           ],
+          'dependencies': [
+            'nacl_common.gyp:nacl_common',
+            'nacl_common.gyp:nacl_switches',
+            '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
+            '../skia/skia.gyp:skia',

[Mark Seaborn, 2013/11/21 23:47:34]

This shouldn't be necessary.  Nothing in NaCl depends on Skia.

+          ],
+          'defines': [
+            '<@(nacl_defines)',
+          ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
         },