fix nacl

fix nacl

TBR=robertphillips
NOTRY=true
NOTREECHECKS=true

Committed: https://skia.googlesource.com/skia/+/fa9d1356d977556b71980b7affee25dffd9f9c83

[caryclark, 2014-07-22 17:36:18]

The CQ bit was checked by caryclark@google.com

[commit-bot: I haz the power, 2014-07-22 17:37:03]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/caryclark@google.com/407163002/1

[robertphillips, 2014-07-22 17:37:58]

lgtm

[robertphillips, 2014-07-22 17:39:55]

The CQ bit was unchecked by robertphillips@google.com

[robertphillips, 2014-07-22 17:39:55]

The CQ bit was checked by robertphillips@google.com

[commit-bot: I haz the power, 2014-07-22 17:40:03]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/caryclark@google.com/407163002/1

[commit-bot: I haz the power, 2014-07-22 17:40:11]

Change committed as fa9d1356d977556b71980b7affee25dffd9f9c83

[caryclark, 2014-07-22 17:49:04]

The CQ bit was checked by caryclark@google.com

[commit-bot: I haz the power, 2014-07-22 17:50:03]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/caryclark@google.com/407163002/20001

[commit-bot: I haz the power, 2014-07-22 17:50:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-07-22 17:50:05]

Failed to apply patch for platform_tools/nacl/src/nacl_interface.cpp:
While running git apply --index -p1;
  error: patch failed: platform_tools/nacl/src/nacl_interface.cpp:24
  error: platform_tools/nacl/src/nacl_interface.cpp: patch does not apply

Patch:       platform_tools/nacl/src/nacl_interface.cpp
Index: platform_tools/nacl/src/nacl_interface.cpp
diff --git a/platform_tools/nacl/src/nacl_interface.cpp
b/platform_tools/nacl/src/nacl_interface.cpp
index
09d55c3feccdd2473024a11638de038af2232ba1..297458dd8e624bc348be5524b9bfbb06d44d3b94
100644
--- a/platform_tools/nacl/src/nacl_interface.cpp
+++ b/platform_tools/nacl/src/nacl_interface.cpp
@@ -24,7 +24,7 @@ class SkiaInstance;
 SkiaInstance* gPluginInstance;
 
 // Main entry point for the app we're linked into
-extern int tool_main(int, char**);
+extern int test_main();
 
 // Tokenize a command line and store it in argc and argv.
 void SkStringToProgramArgs(const SkString commandLine, int* argc, char*** argv)
{
@@ -68,7 +68,7 @@ void RunProgram(const SkString& commandLine) {
     int argc;
     char** argv;
     SkStringToProgramArgs(commandLine, &argc, &argv);
-    tool_main(argc, argv);
+    test_main();
 }