Revert 98616 - Landing chrome side of nacl change pre-dating ppapi switch.

ppapi/native_client/tests/ppapi_messaging/nacl.scons

 # -*- python -*-
 # Copyright 2011 The Native Client Authors.  All rights reserved.
 # Use of this source code is governed by a BSD-style license that can
 # be found in the LICENSE file.
 
 # This is a C PPAPI
 #
 # ppapi_messaging.html - test driver that loads the nexe and scripts it
 # ppapi_messaging.nmf - manifest file for serving platform specific nexe binary.
 #
 # ppapi_messaging.c - implementation of PPP interface and PPP_Instance
 
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
-env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
-                     'ppapi_messaging/')
 
 nexe = 'ppapi_messaging_%s' % env.get('TARGET_FULLARCH')
 
 env.Alias('ppapi_messaging${PROGSUFFIX}',
           ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
 
 ppapi_messaging_nexe = env.ComponentProgram(nexe,
                                             ['ppapi_messaging.c'],
                                             EXTRA_LIBS=['${PPAPI_LIBS}',
                                                         'platform',
                                                         'gio',
                                                         'pthread',
                                                         'm',
                                                        ])
 
 # Note that the html is required to run this program.
 dest_copy = env.Replicate('$STAGING_DIR',
                           ['ppapi_messaging.html',
+                           'ppapi_messaging.nmf',
                            env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
                                     'browserdata/nacltest.js')]
                           )
 env.Depends(nexe, dest_copy)
 
 node = env.PPAPIBrowserTester('ppapi_messaging_browser_test.out',
                               url='ppapi_messaging.html',
-                              nmf='${TEST_DIR}/ppapi_messaging.nmf',
                               files=[ppapi_messaging_nexe,
                                      env.File('ppapi_messaging.nmf'),
                                      env.File('ppapi_messaging.html')])
 
 env.AddNodeToTestSuite(node,
                       ['chrome_browser_tests'],
                        'run_ppapi_messaging_browser_test',
                        is_broken=env.PPAPIBrowserTesterIsBroken())