Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

webkit/plugins/npapi/test/npapi_test.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 //
 // npapitest
 //
 // This is a NPAPI Plugin Program which is used to test the Browser's NPAPI
 // host implementation.  It is used in conjunction with the npapi_unittest.
 //
 // As a NPAPI Plugin, you can invoke it by creating a web page of the following
@@ skipping 34 matching lines @@
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #if defined(__GNUC__) && __GNUC__ >= 4
 #define EXPORT __attribute__((visibility ("default")))
 #else
 #define EXPORT
 #endif
 
-#include "webkit/glue/plugins/test/plugin_client.h"
+#include "webkit/plugins/npapi/test/plugin_client.h"
 
 #if defined(OS_WIN)
 BOOL API_CALL DllMain(HINSTANCE hDll, DWORD dwReason, LPVOID lpReserved) {
   return TRUE;
 }
 #endif
 
 extern "C" {
 EXPORT NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* pFuncs) {
   return NPAPIClient::PluginClient::GetEntryPoints(pFuncs);
@@ skipping 46 matching lines @@
   // greater than the number of plugins.  We specify a mimetype here so
   // this plugin has at least one.
   return "application/vnd.npapi-test:npapitest:test npapi";
 }
 #endif  // OS_POSIX
 } // extern "C"
 
 namespace WebCore {
   const char* currentTextBreakLocaleID() { return "en_us"; }
 }