3 files changed, 13 insertions, 5 deletions
diff --git a/webkit/tools/pepper_test_plugin/README b/webkit/tools/pepper_test_plugin/README
index 4c8003b..96c6397 100644
--- a/webkit/tools/pepper_test_plugin/README
+++ b/webkit/tools/pepper_test_plugin/README
@@ -1,12 +1,18 @@
 This is a test plugin for manual testing of the Pepper plugin API. See
   https://wiki.mozilla.org/Plugins:PlatformIndependentNPAPI
 
-Open the Chrome all.sln solution and rebuild the pepper_test_plugin and
+To generate a project from the gyp file, set the GYP_DEFINES environment
+variable to "enable_pepper=1". From a Windows command prompt:
+  set GYP_DEFINES=enable_pepper=1
+  
+Then rebuild the project files:
+  gclient runhooks --force
+  
+Then open the Chrome all.sln solution and rebuild the pepper_test_plugin and
 chrome projects.
 
 To load this plugin in Chrome, use the command line flags:
   --no-sandbox
-  --internal-pepper
   --load-plugin=<<<YOUR CHECKOUT ROOT>>\src\webkit\tools\pepper_test_plugin\Debug\pepper_test_plugin.dll
   
 A simple way to launch Chrome with these command line flags is to run the
diff --git a/webkit/tools/pepper_test_plugin/event_handler.cc b/webkit/tools/pepper_test_plugin/event_handler.cc
index 7884fac..75ede4e 100644
--- a/webkit/tools/pepper_test_plugin/event_handler.cc
+++ b/webkit/tools/pepper_test_plugin/event_handler.cc
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "webkit/tools/pepper_test_plugin/plugin_object.h"
@@ -128,11 +127,11 @@ int EventHandler::handle(void* event) {
       str += StringPrintf(": mod %x, text: ",
                           npevent->u.character.modifier);
       size_t i;
-      for (i = 0; i < arraysize(npevent->u.character.text); ++i) {
+      for (i = 0; i < ARRAYSIZE(npevent->u.character.text); ++i) {
         str += StringPrintf("%x ", npevent->u.character.text[i]);
       }
       str += ", unmod: ";
-      for (i = 0; i < arraysize(npevent->u.character.unmodifiedText); ++i) {
+      for (i = 0; i < ARRAYSIZE(npevent->u.character.unmodifiedText); ++i) {
           str += StringPrintf("%x ", npevent->u.character.unmodifiedText[i]);
       }
       break;
diff --git a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp
index 5144e76..a19574e 100644
--- a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp
+++ b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp
@@ -12,6 +12,9 @@
       'include_dirs': [
         '../../..',  # Root of Chrome Checkout
       ],
+      'defines': [
+        'PEPPER_APIS_ENABLED',
+      ],
       'conditions': [
         ['OS=="win"', {
           'product_name': 'pepper_test_plugin',