Move webkit/plugins/ppapi to content/renderer/pepper.

content/renderer/pepper/npapi_glue.h

Index: content/renderer/pepper/npapi_glue.h
===================================================================
--- content/renderer/pepper/npapi_glue.h	(revision 213482)
+++ content/renderer/pepper/npapi_glue.h	(working copy)
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_PPAPI_NPAPI_GLUE_H_
-#define WEBKIT_PLUGINS_PPAPI_NPAPI_GLUE_H_
+#ifndef CONTENT_RENDERER_PEPPER_NPAPI_GLUE_H_
+#define CONTENT_RENDERER_PEPPER_NPAPI_GLUE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "content/common/content_export.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_var.h"
-#include "webkit/plugins/webkit_plugins_export.h"
 
 struct NPObject;
 typedef struct _NPVariant NPVariant;
@@ -38,8 +38,7 @@
 //
 // The returned PP_Var will have a refcount of 1, this passing ownership of
 // the reference to the caller. This is suitable for returning to a plugin.
-WEBKIT_PLUGINS_EXPORT PP_Var NPVariantToPPVar(PluginInstanceImpl* instance,
-                                              const NPVariant* variant);
+PP_Var NPVariantToPPVar(PluginInstanceImpl* instance, const NPVariant* variant);
 
 // Returns a NPIdentifier that corresponds to the given PP_Var. The contents
 // of the PP_Var will be copied. Returns 0 if the given PP_Var is not a a
@@ -65,15 +64,14 @@
 // Note: this could easily be changed to take a PP_Instance instead if that
 // makes certain calls in the future easier. Currently all callers have a
 // PluginInstance so that's what we use here.
-WEBKIT_PLUGINS_EXPORT PP_Var NPObjectToPPVar(PluginInstanceImpl* instance,
-                                             NPObject* object);
+CONTENT_EXPORT PP_Var NPObjectToPPVar(PluginInstanceImpl* instance,
+                                      NPObject* object);
 
 // This version creates a default v8::Context rather than using the one from
 // the container of |instance|. It is only for use in unit tests, where we don't
 // have a real container for |instance|.
-WEBKIT_PLUGINS_EXPORT PP_Var NPObjectToPPVarForTest(
-    PluginInstanceImpl* instance,
-    NPObject* object);
+CONTENT_EXPORT PP_Var NPObjectToPPVarForTest(PluginInstanceImpl* instance,
+                                             NPObject* object);
 
 // PPResultAndExceptionToNPResult ----------------------------------------------
 
@@ -264,4 +262,4 @@
 }  // namespace ppapi
 }  // namespace webkit
 
-#endif  // WEBKIT_PLUGINS_PPAPI_NPAPI_GLUE_H_
+#endif  // CONTENT_RENDERER_PEPPER_NPAPI_GLUE_H_