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

components/nacl.gyp

 # Copyright 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': {
     'chromium_code': 1,
   },
   'includes': [
     '../native_client/build/untrusted.gypi',
@@ skipping 22 matching lines @@
           'nacl/loader/nacl_main.cc',
           'nacl/loader/nacl_main_platform_delegate.h',
           'nacl/loader/nacl_main_platform_delegate_linux.cc',
           'nacl/loader/nacl_main_platform_delegate_mac.mm',
           'nacl/loader/nacl_main_platform_delegate_win.cc',
           'nacl/loader/nacl_listener.cc',
           'nacl/loader/nacl_listener.h',
           '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': [
           ['OS=="win"', {
             'defines': [
               '__STDC_LIMIT_MACROS=1',
             ],
             'include_dirs': [
               '<(DEPTH)/third_party/wtl/include',
             ],
@@ skipping 42 matching lines @@
           'direct_dependent_settings': {
             'defines': [
               '<@(nacl_defines)',
             ],
           },
         },
         {
           '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, ],
         },
       ],
       'conditions': [
         ['OS=="linux"', {
           'targets': [
             {
               'target_name': 'nacl_helper',
               'type': 'executable',
@@ skipping 108 matching lines @@
               'target_name': 'nacl_win64',
               'type': 'none',
               'sources': [],
             },
           ],
         }],
       ],
     }],
   ],
 }