Refactoring: Split NaClListener into two delegated classes.

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': [
     'nacl/nacl_defines.gypi',
   ],
   'target_defaults': {
     'variables': {
       'nacl_target': 0,
     },
     'target_conditions': [
       # This part is shared between the targets defined below. Only files and
       # settings relevant for building the Win64 target should be added here.
       ['nacl_target==1', {
         'include_dirs': [
           '<(INTERMEDIATE_DIR)',
         ],
         'defines': [
           '<@(nacl_defines)',
         ],
         'sources': [
           # .cc, .h, and .mm files under nacl that are used on all
           # platforms, including both 32-bit and 64-bit Windows.
           # Test files are also not included.
+          'nacl/loader/listener_delegate.h',
           'nacl/loader/nacl_ipc_adapter.cc',
           'nacl/loader/nacl_ipc_adapter.h',
           '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_trusted_listener.cc',
           'nacl/loader/nacl_trusted_listener.h',
           'nacl/loader/nacl_validation_db.h',
           'nacl/loader/nacl_validation_query.cc',
           'nacl/loader/nacl_validation_query.h',
+          'nacl/loader/sfi_listener_delegate.cc',
+          'nacl/loader/sfi_listener_delegate.h',
         ],
         # 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 177 matching lines @@
           'targets': [
             {
               'target_name': 'nacl_helper',
               'type': 'executable',
               'include_dirs': [
                 '..',
               ],
               'sources': [
                 'nacl/loader/nacl_helper_linux.cc',
                 'nacl/loader/nacl_helper_linux.h',
+                'nacl/loader/nonsfi_listener_delegate.cc',
+                'nacl/loader/nonsfi_listener_delegate.h',
               ],
               'dependencies': [
                 'nacl_linux',
               ],
               'cflags': ['-fPIE'],
               'ldflags!': [
                 # Do not pick the default ASan options from
                 # base/debug/sanitizer_options.cc to avoid a conflict with those
                 # in nacl/nacl_helper_linux.cc.
                 '-Wl,-u_sanitizer_options_link_helper',
@@ skipping 247 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../content/content.gyp:content_common',
       ],
     },
   ]
 }