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

chrome/browser/plugin_process_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/browser/plugin_process_host.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_POSIX)
 #include <utility>  // for pair<>
@@ skipping 151 matching lines @@
         BrowserThread::UI, FROM_HERE,
         NewRunnableFunction(mac_util::SetCursorVisibility,
                             true));
     }
   }
 #endif
   // Cancel all pending and sent requests.
   CancelRequests();
 }
 
-bool PluginProcessHost::Init(const WebPluginInfo& info,
+bool PluginProcessHost::Init(const webkit::npapi::WebPluginInfo& info,
                              const std::string& locale) {
   info_ = info;
   set_name(UTF16ToWideHack(info_.name));
   set_version(UTF16ToWideHack(info_.version));
 
   if (!CreateChannel())
     return false;
 
   // Build command line for plugin. When we have a plugin launcher, we can't
   // allow "self" on linux and we need the real file path.
@@ skipping 277 matching lines @@
     const std::vector<uint8>& data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   ChromePluginLib *chrome_plugin = ChromePluginLib::Find(info_.path);
   if (chrome_plugin) {
     void *data_ptr = const_cast<void*>(reinterpret_cast<const void*>(&data[0]));
     uint32 data_len = static_cast<uint32>(data.size());
     chrome_plugin->functions().on_message(data_ptr, data_len);
   }
 }