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

webkit/plugins/npapi/test/plugin_client.cc

-// Copyright (c) 2009 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.
 
-#include "webkit/glue/plugins/test/plugin_client.h"
+#include "webkit/plugins/npapi/test/plugin_client.h"
 
 #include "base/string_util.h"
-#include "webkit/glue/plugins/test/plugin_test.h"
-#include "webkit/glue/plugins/test/plugin_test_factory.h"
+#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "webkit/plugins/npapi/test/plugin_test_factory.h"
 
 namespace NPAPIClient {
 
 NPNetscapeFuncs* PluginClient::host_functions_;
 
 NPError PluginClient::GetEntryPoints(NPPluginFuncs* pFuncs) {
   if (pFuncs == NULL)
     return NPERR_INVALID_FUNCTABLE_ERROR;
 
   if (pFuncs->size < sizeof(NPPluginFuncs))
@@ skipping 211 matching lines @@
 
 void NPP_URLRedirectNotify(NPP instance, const char* url, int32_t status,
                            void* notify_data) {
   if (instance) {
     NPAPIClient::PluginTest* plugin =
         reinterpret_cast<NPAPIClient::PluginTest*>(instance->pdata);
     plugin->URLRedirectNotify(url, status, notify_data);
   }
 }
 } // extern "C"