Remove redundant nphostapi.h from webkit/glue/plugins, update source files as...

webkit/tools/pepper_test_plugin/main.cc

 /*
  IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
  consideration of your agreement to the following terms, and your use, installation,
  modification or redistribution of this Apple software constitutes acceptance of these
  terms.  If you do not agree with these terms, please do not use, install, modify or
  redistribute this Apple software.
 
  In consideration of your agreement to abide by the following terms, and subject to these
  terms, Apple grants you a personal, non-exclusive license, under Apple’s copyrights in
  this original Apple software (the "Apple Software"), to use, reproduce, modify and
@@ skipping 25 matching lines @@
 
 #include "gpu/pgl/pgl.h"
 
 #if defined(INDEPENDENT_PLUGIN)
 #include <iostream>
 #define LOG(x) std::cerr
 #else
 #include "base/logging.h"
 #include "base/string_util.h"
 #endif
-#include "webkit/glue/plugins/nphostapi.h"
+#include "third_party/npapi/bindings/nphostapi.h"
 #include "webkit/tools/pepper_test_plugin/plugin_object.h"
 #include "webkit/tools/pepper_test_plugin/event_handler.h"
 
 #if __GNUC__ >= 4
 #define EXPORT __attribute__ ((visibility("default")))
 #elif defined(_MSC_VER)
 #define EXPORT __declspec(dllexport)
 #endif
 
 namespace {
@@ skipping 227 matching lines @@
 
 #if defined(OS_LINUX)
 NPError API_CALL NP_GetValue(NPP instance, NPPVariable variable, void* value) {
   return NPP_GetValue(instance, variable, value);
 }
 
 const char* API_CALL NP_GetMIMEDescription() {
   return "pepper-application/x-pepper-test-plugin::Pepper Test";
 }
 #endif