Fix pepper debugging example.

The example no longer requires the stand alone sel_ldr and IRT which
prevent use of this example while simultaneously using an OpenGL ES
context.

BUG=133394
R=binji@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10575012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142872 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 14 insertions, 25 deletions

diff --git a/native_client_sdk/src/examples/debugging/Makefile.inc b/native_client_sdk/src/examples/debugging/Makefile.inc
index f039de7..606c5aa 100644
--- a/native_client_sdk/src/examples/debugging/Makefile.inc
+++ b/native_client_sdk/src/examples/debugging/Makefile.inc
@@ -1,26 +1,16 @@
 #
-# Setup environment to use SDK's version of the NaCl plugin, instead of the
-# one built into Chrome.  This requries launching Chrome which means we must
-# be able to find it.  It also means that we must determine which versions
-# of the plugin, loader, irt, and any other helpers we must use.
+# Setup environment to enable various debugging features, including
+# access to the file system, untrusted exception handling, etc...
 #
-HELPER_PATH:=$(shell python $(NACL_SDK_ROOT)/tools/getos.py --helper)
-IRTBIN_PATH:=$(shell python $(NACL_SDK_ROOT)/tools/getos.py --irtbin)
-LOADER_PATH:=$(shell python $(NACL_SDK_ROOT)/tools/getos.py --loader)
-PLUGIN_PATH:=$(shell python $(NACL_SDK_ROOT)/tools/getos.py --plugin)
-CHROME_ARGS:=--incognito --no-sandbox
-CHROME_ARGS+="--register-pepper-plugins=$(PLUGIN_PATH);application/x-nacl"
 
+CHROME_ARGS:=--incognito --no-sandbox
 
 ifneq (,$(wildcard $(CHROME_PATH)))
 export NACL_DANGEROUS_ENABLE_FILE_ACCESS=1
 export NACL_SECURITY_DISABLE=1
 export NACL_UNTRUSTED_EXCEPTION_HANDLING=1
-export NACL_SEL_LDR=$(LOADER_PATH)
-export NACL_IRT_LIBRARY=$(IRTBIN_PATH)
-export NACL_SEL_LDR_BOOTSTRAP=$(HELPER_PATH)
 endif
 
 
 TRACE: CHECK_FOR_CHROME all
-	$(CHROME_PATH) $(CHROME_ARGS) "localhost:5103/$(PROJECT).html"
+	$(CHROME_PATH) $(CHROME_ARGS) "localhost:5103/index.html"
diff --git a/native_client_sdk/src/examples/debugging/index.html b/native_client_sdk/src/examples/debugging/index.html
index 6254eb5..ec91c5b 100644
--- a/native_client_sdk/src/examples/debugging/index.html
+++ b/native_client_sdk/src/examples/debugging/index.html
@@ -93,18 +93,17 @@
 <h2>How the example works</h2>
 <p>This example shows how to trap an untrusted exception (such as a illegal 
 memory reference in the NEXE).  This debugging technique can only be used
-for development since it requires several command-line switches, environment
-variables, and a special version of the Native Client plugin.  The test works
-by loading the module and communicating with it through PostMessage.  Messages
-from the module are sent to the Status line and/or the Log window in the page.
-Four seconds after the module is loaded, the JavaScript on this page sends a
-'BOOM' message to the module that causes the module to  dereference an illegal
-location in memory.</p>
+for development since it requires several command-line switches, and 
+environment variables.  The test works by loading the module and communicating
+with it through PostMessage.  Messages from the module are sent to the Status
+line and/or the Log window in the page. Four seconds after the module is
+loaded, the JavaScript on this page sends a 'BOOM' message to the module that
+causes the module to  dereference an illegal location in memory.</p>
 
 <p>If your setup is correct (you launched Chrome with the appropriate
 command-line arguments and environment variables), the Log window bellow should
-show the that the crash dump facilities are turn on. When the crash data
-arrives from the module, the data is forwarded to the HTTP server, which drives
+show that the crash dump facilities are turn on. When the crash data arrives
+from the module, the data is forwarded to the HTTP server, which drives
 a decoder and sends back a stack trace to the web page.</p>
 
 <p>If setup incorrectly, the NaCl module may or may not load.  If the module 
@@ -118,14 +117,14 @@ would normally send.
 In one terminal window, to start the server:
 <ul>
 <li>Set the CHROME_PATH environment variable to the fully qualified path of your
-cChrome executable.</li>
+Chrome executable.</li>
 <li>From the example directory type: <b>make RUN</b></li>
 </ul>
 In another terminal window, to automatically start Chrome with the correct
 environment variables and command-line switches:
 <ul>
 <li>Set the CHROME_PATH environment variable to the fully qualified path of your
-cChrome executable.</li>
+Chrome executable.</li>
 <li>From the example directory type: <b>make TRACE</b></li>
 </ul>