Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/bridge/npapi.h

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 90 matching lines @@
 
 #ifdef XP_WIN
     #include <windows.h>
 #endif
 
 /*----------------------------------------------------------------------*/
 /*             Plugin Version Constants                                 */
 /*----------------------------------------------------------------------*/
 
 #define NP_VERSION_MAJOR 0
-#define NP_VERSION_MINOR 23
+#define NP_VERSION_MINOR 20
+
+
 
 /*----------------------------------------------------------------------*/
 /*             Definition of Basic Types                                */
 /*----------------------------------------------------------------------*/
 
 #ifndef _UINT16
 #define _UINT16
 typedef unsigned short uint16;
 #endif
 
@@ skipping 212 matching lines @@
      */
     NPPVformValue = 16,    /* Not implemented in WebKit */
 
     NPPVpluginUrlRequestsDisplayedBool = 17, /* Not implemented in WebKit */
 
     /* Checks if the plugin is interested in receiving the http body of
      * failed http requests (http status != 200).
      */
     NPPVpluginWantsAllNetworkStreams = 18,
 
-    NPPVpluginPrivateModeBool = 19,
-    
 #ifdef XP_MACOSX
     /* Used for negotiating drawing models */
     NPPVpluginDrawingModel = 1000,
     /* Used for negotiating event models */
     NPPVpluginEventModel = 1001,
     /* The plug-in text input vtable */
     NPPVpluginTextInputFuncs = 1002,
     /* In the NPDrawingModelCoreAnimation drawing model, the browser asks the plug-in for a Core Animation layer. */
     NPPVpluginCoreAnimationLayer = 1003
 #endif
@@ skipping 16 matching lines @@
     NPNVDOMWindow      = (12 | NP_ABI_MASK),  /* Not implemented in WebKit */
     NPNVToolkit        = (13 | NP_ABI_MASK),  /* Not implemented in WebKit */
     NPNVSupportsXEmbedBool = 14,              /* Not implemented in WebKit */
 
     /* Get the NPObject wrapper for the browser window. */
     NPNVWindowNPObject = 15,
 
     /* Get the NPObject wrapper for the plugins DOM element. */
     NPNVPluginElementNPObject = 16,
 
-    NPNVSupportsWindowless = 17,
-    
-    NPNVprivateModeBool = 18
+    NPNVSupportsWindowless = 17
 
 #ifdef XP_MACOSX
     , NPNVpluginDrawingModel = 1000 /* The NPDrawingModel specified by the plugin */
 
 #ifndef NP_NO_QUICKDRAW
     , NPNVsupportsQuickDrawBool = 2000 /* TRUE if the browser supports the QuickDraw drawing model */
 #endif
     , NPNVsupportsCoreGraphicsBool = 2001 /* TRUE if the browser supports the CoreGraphics drawing model */
     , NPNVsupportsOpenGLBool = 2002 /* TRUE if the browser supports the OpenGL drawing model (CGL on Mac) */
     , NPNVsupportsCoreAnimationBool = 2003 /* TRUE if the browser supports the CoreAnimation drawing model */
 
 #ifndef NP_NO_CARBON
     , NPNVsupportsCarbonBool = 3000 /* TRUE if the browser supports the Carbon event model */
 #endif
     , NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */
     
     , NPNVbrowserTextInputFuncs = 1002 /* The browser text input vtable */
 #endif /* XP_MACOSX */
 } NPNVariable;
 
-typedef enum {
-   NPNURLVCookie = 501,
-   NPNURLVProxy
-} NPNURLVariable;
-
 /*
  * The type of a NPWindow - it specifies the type of the data structure
  * returned in the window field.
  */
 typedef enum {
     NPWindowTypeWindow = 1,
     NPWindowTypeDrawable
 } NPWindowType;
 
 #ifdef XP_MACOSX
@@ skipping 306 matching lines @@
 #define NPVERS_WIN16_HAS_LIVECONNECT    9
 #define NPVERS_68K_HAS_LIVECONNECT    11
 #define NPVERS_HAS_WINDOWLESS       11
 #define NPVERS_HAS_XPCONNECT_SCRIPTING    13  /* Not implemented in WebKit */
 #define NPVERS_HAS_NPRUNTIME_SCRIPTING    14
 #define NPVERS_HAS_FORM_VALUES            15  /* Not implemented in WebKit; see bug 13061 */
 #define NPVERS_HAS_POPUPS_ENABLED_STATE   16  /* Not implemented in WebKit */
 #define NPVERS_HAS_RESPONSE_HEADERS       17
 #define NPVERS_HAS_NPOBJECT_ENUM          18
 #define NPVERS_HAS_PLUGIN_THREAD_ASYNC_CALL 19
-#define NPVERS_HAS_ALL_NETWORK_STREAMS    20
-#define NPVERS_HAS_URL_AND_AUTH_INFO      21
-#define NPVERS_HAS_PRIVATE_MODE           22
-#define NPVERS_MACOSX_HAS_EVENT_MODELS    23
-
+#define NPVERS_MACOSX_HAS_EVENT_MODELS    20
 
 /*----------------------------------------------------------------------*/
 /*             Function Prototypes                */
 /*----------------------------------------------------------------------*/
 
 #if defined(_WINDOWS) && !defined(WIN32)
 #define NP_LOADDS  _loadds
 #else
 #define NP_LOADDS
 #endif
@@ skipping 81 matching lines @@
 void        NPN_PluginThreadAsyncCall(NPP instance, void (*func) (void *), void *userData);
 uint32      NPN_ScheduleTimer(NPP instance, uint32 interval, NPBool repeat, void (*timerFunc)(NPP npp, uint32 timerID));
 void        NPN_UnscheduleTimer(NPP instance, uint32 timerID);
 NPError     NPN_PopUpContextMenu(NPP instance, NPMenu* menu);
 
 #ifdef __cplusplus
 }  /* end extern "C" */
 #endif
 
 #endif /* _NPAPI_H_ */