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

chrome/nacl.gypi

Index: chrome/nacl.gypi
===================================================================
--- chrome/nacl.gypi	(revision 90812)
+++ chrome/nacl.gypi	(working copy)
@@ -28,8 +28,8 @@
           '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': [
@@ -45,9 +45,6 @@
             'defines': [
               '__STDC_LIMIT_MACROS=1',
             ],
-            'sources': [
-              'nacl/nacl_fork_delegate_linux.cc',
-            ],
           },],
         ],
       }],
@@ -144,22 +141,5 @@
         },
       ],
     }],
-    ['OS=="linux"', {
-      'targets': [
-        {
-          'target_name': 'nacl_helper',
-          'type': 'executable',
-          'include_dirs': [
-            '..',
-          ],
-          'dependencies': [
-            'nacl',
-          ],
-          'sources': [
-            '../chrome/nacl/nacl_helper_linux.cc',
-          ],
-        },
-      ],
-    }],
   ],
 }
Property changes on: chrome/nacl.gypi
___________________________________________________________________
Added: svn:mergeinfo