Revert 34161 - Enable Pepper support by default, including building the test plugin.

This is needed because the NaCl plugin code that runs in the renderer
needs to use Pepper APIs all the time, and NaCl support has been enabled
by default for several months now.  To cause an untrusted Pepper plugin
to run in the renderer one needs to specify the internalpepper flag.
I have also removed the enable_pepper flag from gyp.  As the build of the
GPU process was tied to this flag, I have renamed the flag to enable_gpu.
TEST=none
BUG=none

Review URL: http://codereview.chromium.org/464074

TBR=sehr@google.com
Review URL: http://codereview.chromium.org/475004

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

1 files changed, 5 insertions, 9 deletions

diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc
index e4f4992..291aa13 100644
--- a/webkit/glue/plugins/plugin_host.cc
+++ b/webkit/glue/plugins/plugin_host.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// Pepper API support should be turned on for this module.
+#define PEPPER_APIS_ENABLED
+
 #include "webkit/glue/plugins/plugin_host.h"
 
 #include "base/file_util.h"
@@ -799,16 +802,9 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void* value) {
       break;
     }
   #endif  // OS_MACOSX
-    case NPNVPepperExtensions: {
-      scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
-      if (plugin->webplugin()->delegate() != NULL) {
-        // Delegate is only set for in-renderer Pepper plugins.
-        rv = NPAPI::GetPepperExtensionsFunctions(value);
-      } else {
-        rv = NPERR_GENERIC_ERROR;
-      }
+    case NPNVPepperExtensions:
+      rv = NPAPI::GetPepperExtensionsFunctions(value);
       break;
-    }
     default:
       DLOG(INFO) << "NPN_GetValue(" << variable << ") is not implemented yet.";
       break;