Revert 90805 - I am submitting this with LGTMs from agl@ and evanm@. I'm marking this as TBR=jam@...

chrome/nacl.gypi

 # Copyright (c) 2011 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.
 
 {
   'target_defaults': {
     'variables': {
       'nacl_target': 0,
     },
     'target_conditions': [
@@ skipping 10 matching lines @@
         ],
         '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/nacl_main.cc',
           'nacl/nacl_main_platform_delegate.h',
           'nacl/nacl_main_platform_delegate_linux.cc',
           'nacl/nacl_main_platform_delegate_mac.mm',
           'nacl/nacl_main_platform_delegate_win.cc',
-          'nacl/nacl_listener.cc',
-          'nacl/nacl_listener.h',
+          'nacl/nacl_launcher_thread.cc',
+          'nacl/nacl_launcher_thread.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',
             ],
           },],
           ['OS=="linux"', {
             'defines': [
               '__STDC_LIMIT_MACROS=1',
             ],
-            'sources': [
-              'nacl/nacl_fork_delegate_linux.cc',
-            ],
           },],
         ],
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'nacl',
       'type': 'static_library',
       'variables': {
@@ skipping 76 matching lines @@
           'direct_dependent_settings': {
             'defines': [
               'NACL_BLOCK_SHIFT=5',
               'NACL_BLOCK_SIZE=32',
               '<@(nacl_defines)',
             ],
           },
         },
       ],
     }],
-    ['OS=="linux"', {
-      'targets': [
-        {
-          'target_name': 'nacl_helper',
-          'type': 'executable',
-          'include_dirs': [
-            '..',
-          ],
-          'dependencies': [
-            'nacl',
-          ],
-          'sources': [
-            '../chrome/nacl/nacl_helper_linux.cc',
-          ],
-        },
-      ],
-    }],
   ],
 }