Remove the obsolete JRI bits from the NPAPI headers

BUG=42645
TEST=Existing plugin tests continue to pass; nothing should change.

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

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

3 files changed, 2 insertions, 20 deletions

diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h
index bf9399a..bdaa4db 100644
--- a/third_party/npapi/bindings/npapi.h
+++ b/third_party/npapi/bindings/npapi.h
@@ -60,13 +60,6 @@
 #endif
 #endif
 
-#ifdef INCLUDE_JAVA
-#include "jri.h"                /* Java Runtime Interface */
-#else
-#define jref    void *
-#define JRIEnv  void
-#endif
-
 #ifdef _WIN32
 #include <windows.h>
 #ifndef XP_WIN
@@ -777,7 +770,6 @@ void    NP_LOADDS NPP_Print(NPP instance, NPPrint* platformPrint);
 int16_t           NPP_HandleEvent(NPP instance, void* event);
 void    NP_LOADDS NPP_URLNotify(NPP instance, const char* url,
                                 NPReason reason, void* notifyData);
-jref    NP_LOADDS NPP_GetJavaClass(void);
 NPError           NPP_GetValue(NPP instance, NPPVariable variable, void *value);
 NPError           NPP_SetValue(NPP instance, NPNVariable variable, void *value);
 
@@ -809,8 +801,6 @@ void*                 NPN_MemAlloc(uint32_t size);
 void                  NPN_MemFree(void* ptr);
 uint32_t              NPN_MemFlush(uint32_t size);
 void                  NPN_ReloadPlugins(NPBool reloadPages);
-JRIEnv*               NPN_GetJavaEnv(void);
-jref                  NPN_GetJavaPeer(NPP instance);
 NPError               NPN_GetValue(NPP instance, NPNVariable variable,
                                    void *value);
 NPError               NPN_SetValue(NPP instance, NPPVariable variable,
diff --git a/third_party/npapi/bindings/nphostapi.h b/third_party/npapi/bindings/nphostapi.h
index baa2a44..0a37987 100644
--- a/third_party/npapi/bindings/nphostapi.h
+++ b/third_party/npapi/bindings/nphostapi.h
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO:  Did not implement JRIGlobalRef function yet.  Not sure if this is used?
-
 #ifndef _NPHOSTAPI_H_
 #define _NPHOSTAPI_H_
 
@@ -56,7 +54,6 @@ typedef void         (*NPP_URLNotifyProcPtr)(NPP instance,
                          const char* url,
                          NPReason reason,
                          void* notifyData);
-typedef void* JRIGlobalRef; //not using this right now
 typedef NPError      (*NPP_GetValueProcPtr)(NPP instance,
                          NPPVariable variable,
                          void *ret_alue);
@@ -240,7 +237,7 @@ typedef struct _NPPluginFuncs {
     NPP_PrintProcPtr print;
     NPP_HandleEventProcPtr event;
     NPP_URLNotifyProcPtr urlnotify;
-    JRIGlobalRef javaClass;
+    void* javaClass;
     NPP_GetValueProcPtr getvalue;
     NPP_SetValueProcPtr setvalue;
 } NPPluginFuncs;
diff --git a/webkit/glue/plugins/test/plugin_client.cc b/webkit/glue/plugins/test/plugin_client.cc
index 1cf57e7..d617e16 100644
--- a/webkit/glue/plugins/test/plugin_client.cc
+++ b/webkit/glue/plugins/test/plugin_client.cc
@@ -33,7 +33,7 @@ NPError PluginClient::GetEntryPoints(NPPluginFuncs* pFuncs) {
   pFuncs->urlnotify     = NPP_URLNotify;
   pFuncs->getvalue      = NPP_GetValue;
   pFuncs->setvalue      = NPP_SetValue;
-  pFuncs->javaClass     = reinterpret_cast<JRIGlobalRef>(NPP_GetJavaClass);
+  pFuncs->javaClass     = NULL;
 
   return NPERR_NO_ERROR;
 }
@@ -227,9 +227,4 @@ int16 NPP_HandleEvent(NPP instance, void* event) {
 
   return plugin->HandleEvent(event);
 }
-
-void* NPP_GetJavaClass(void) {
-  // XXXMB - do work here.
-  return NULL;
-}
 } // extern "C"