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

ppapi/native_client/tests/ppapi_gles_book/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.
 
 # OpenGL ES examples
 
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
-env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
-                     'ppapi_gles_book/')
 
 # Underlay $SOURCE_ROOT/gpu in this directory.
 Dir('.').addRepository(Dir('#/../gpu'))
 
 # Underlay $SOURCE_ROOT/third_party/gles2_book in this directory.
 Dir('.').addRepository(Dir('#/../third_party/gles2_book'))
 
 # Don't warn on pointer signedness issues (third_party sources)
 env.Append(CFLAGS=['-Wno-pointer-sign'])
 # ..and don't warn about missing braces
@@ skipping 29 matching lines @@
         'Chapter_8/Simple_VertexShader/Simple_VertexShader.c'],
     'stencil_test': [
         'Chapter_11/Stencil_Test/Stencil_Test.c'],
     'texture_wrap': [
         'Chapter_9/TextureWrap/TextureWrap.c'],
 }
 
 for demo, sources in gles_book_examples.iteritems():
     nexe_name = ('ppapi_gles_book_%s_%s'
                  % (demo, env.get('TARGET_FULLARCH')))
-    nmf_name = '${TEST_DIR}/ppapi_gles_book_' + demo + '.nmf'
+    nmf_name = 'ppapi_gles_book_' + demo + '.nmf'
     nexe = env.ComponentProgram(
         nexe_name,
         ['demos/gles2_book/demo_' + demo + '.cc'] + sources,
         EXTRA_LIBS=['${PPAPI_LIBS}',
                     'ppapi_cpp',
                     'ppapi_gles_demo',
                     'ppapi_cpp',
                     'ppapi_gles2',
                     'm'])
     env.Publish(nexe_name, 'run',
-                ['ppapi_gles_book.html'])
+                ['ppapi_gles_book.html',
+                 nmf_name])
     test = env.PPAPIBrowserTester(
         'ppapi_gles_book_' + demo + '.out',
         url='ppapi_gles_book.html?manifest=' + nmf_name,
-        nmf=nmf_name,
         files=[nexe,
                env.File(nmf_name),
                env.File('ppapi_gles_book.html')],
         browser_flags=['--enable-accelerated-plugins'])
     env.AddNodeToTestSuite(
         test,
         ['chrome_browser_tests'],
         'run_ppapi_gles_book_' + demo + '_test',
         is_broken=env.PPAPIBrowserTesterIsBroken() or
                   env.PPAPIGraphics3DIsBroken())