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

chrome/plugin/chrome_plugin_host.cc

 // 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 "chrome/plugin/chrome_plugin_host.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/string_split.h"
 #include "chrome/common/child_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/chrome_plugin_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/resource_dispatcher.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_proxy.h"
 #include "net/base/data_url.h"
 #include "net/base/io_buffer.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_response_headers.h"
 #include "webkit/appcache/appcache_interfaces.h"
-#include "webkit/glue/plugins/plugin_instance.h"
+#include "webkit/plugins/npapi/plugin_instance.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/resource_type.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace {
 
 using webkit_glue::ResourceLoaderBridge;
 using webkit_glue::ResourceResponseInfo;
 
 static MessageLoop* g_plugin_thread_message_loop;
@@ skipping 369 matching lines @@
   CPError rv = CPB_GetCommandLineArgumentsCommon(url, &arguments_str);
   if (rv == CPERR_SUCCESS)
     *arguments = CPB_StringDup(CPB_Alloc, arguments_str);
   return rv;
 }
 
 CPBrowsingContext STDCALL CPB_GetBrowsingContextFromNPP(NPP npp) {
   if (!npp)
     return CPERR_INVALID_PARAMETER;
 
-  NPAPI::PluginInstance* instance =
-      static_cast<NPAPI::PluginInstance *>(npp->ndata);
+  webkit::npapi::PluginInstance* instance =
+      static_cast<webkit::npapi::PluginInstance *>(npp->ndata);
   WebPluginProxy* webplugin =
       static_cast<WebPluginProxy*>(instance->webplugin());
 
   return webplugin->GetCPBrowsingContext();
 }
 
 int STDCALL CPB_GetBrowsingContextInfo(
     CPID id, CPBrowsingContext context, CPBrowsingContextInfoType type,
     void* buf, uint32 buf_size) {
   CHECK(ChromePluginLib::IsPluginThread());
@@ skipping 291 matching lines @@
 
     response_funcs.size = sizeof(response_funcs);
     response_funcs.received_redirect = CPRR_ReceivedRedirect;
     response_funcs.start_completed = CPRR_StartCompleted;
     response_funcs.read_completed = CPRR_ReadCompleted;
     response_funcs.upload_progress = CPRR_UploadProgress;
   }
 
   return &browser_funcs;
 }