Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/plugins/npfunctions.h

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 45 matching lines @@
 typedef void (*NPN_InvalidateRectProcPtr)(NPP instance, NPRect *rect);
 typedef void (*NPN_InvalidateRegionProcPtr)(NPP instance, NPRegion region);
 typedef void (*NPN_ForceRedrawProcPtr)(NPP instance);
 typedef NPError (*NPN_GetURLProcPtr)(NPP instance, const char* URL, const char* window);
 typedef NPError (*NPN_PostURLProcPtr)(NPP instance, const char* URL, const char* window, uint32 len, const char* buf, NPBool file);
 typedef void* (*NPN_GetJavaEnvProcPtr)(void);
 typedef void* (*NPN_GetJavaPeerProcPtr)(NPP instance);
 typedef void  (*NPN_PushPopupsEnabledStateProcPtr)(NPP instance, NPBool enabled);
 typedef void  (*NPN_PopPopupsEnabledStateProcPtr)(NPP instance);
 typedef void (*NPN_PluginThreadAsyncCallProcPtr)(NPP npp, void (*func)(void *), void *userData);
-typedef NPError (*NPN_GetValueForURLProcPtr)(NPP npp, NPNURLVariable variable, const char* url, char** value, uint32_t* len);
-typedef NPError (*NPN_SetValueForURLProcPtr)(NPP npp, NPNURLVariable variable, const char* url, const char* value, uint32_t* len);
-typedef NPError (*NPN_GetAuthenticationInfoPtr)(NPP npp, const char* protocol, const char* host, int32_t port, const char* scheme, const char *realm, char** username, uint32_t* ulen, char** password, uint32_t* plen);
-
 typedef uint32 (*NPN_ScheduleTimerProcPtr)(NPP npp, uint32 interval, NPBool repeat, void (*timerFunc)(NPP npp, uint32 timerID));
 typedef void (*NPN_UnscheduleTimerProcPtr)(NPP npp, uint32 timerID);
 typedef NPError (*NPN_PopUpContextMenuProcPtr)(NPP instance, NPMenu* menu);
 
 typedef void (*NPN_ReleaseVariantValueProcPtr) (NPVariant *variant);
 
 typedef NPIdentifier (*NPN_GetStringIdentifierProcPtr) (const NPUTF8 *name);
 typedef void (*NPN_GetStringIdentifiersProcPtr) (const NPUTF8 **names, int32_t nameCount, NPIdentifier *identifiers);
 typedef NPIdentifier (*NPN_GetIntIdentifierProcPtr) (int32_t intid);
 typedef int32_t (*NPN_IntFromIdentifierProcPtr) (NPIdentifier identifier);
@@ skipping 75 matching lines @@
     NPN_RemovePropertyProcPtr removeproperty;
     NPN_HasPropertyProcPtr hasproperty;
     NPN_HasMethodProcPtr hasmethod;
     NPN_ReleaseVariantValueProcPtr releasevariantvalue;
     NPN_SetExceptionProcPtr setexception;
     NPN_PushPopupsEnabledStateProcPtr pushpopupsenabledstate;
     NPN_PopPopupsEnabledStateProcPtr poppopupsenabledstate;
     NPN_EnumerateProcPtr enumerate;
     NPN_PluginThreadAsyncCallProcPtr pluginthreadasynccall;
     NPN_ConstructProcPtr construct;
-    NPN_GetValueForURLProcPtr getvalueforurl;
-    NPN_SetValueForURLProcPtr setvalueforurl;
-    NPN_GetAuthenticationInfoPtr getauthenticationinfo;
     NPN_ScheduleTimerProcPtr scheduletimer;
     NPN_UnscheduleTimerProcPtr unscheduletimer;
     NPN_PopUpContextMenuProcPtr popupcontextmenu;
 } NPNetscapeFuncs;
 
 typedef struct _NPPluginFuncs {
     uint16 size;
     uint16 version;
     NPP_NewProcPtr newp;
     NPP_DestroyProcPtr destroy;
@@ skipping 24 matching lines @@
 typedef EXPORTED_CALLBACK(char*, NP_GetMIMEDescriptionFuncPtr)(void);
 #else
 typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*);
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif