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

chrome/browser/plugin_data_remover.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_data_remover.h"
 
 #include "base/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "base/version.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/common/plugin_messages.h"
-#include "webkit/glue/plugins/plugin_group.h"
-#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_group.h"
+#include "webkit/plugins/npapi/plugin_list.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #endif
 
 namespace {
 const char* g_flash_mime_type = "application/x-shockwave-flash";
 // TODO(bauerb): Update minimum required Flash version as soon as there is one
 // implementing the API.
 const char* g_min_flash_version = "100";
@@ skipping 33 matching lines @@
 
 int PluginDataRemover::ID() {
   // Generate an ID for the browser process.
   return ChildProcessInfo::GenerateChildProcessUniqueId();
 }
 
 bool PluginDataRemover::OffTheRecord() {
   return false;
 }
 
-void PluginDataRemover::SetPluginInfo(const WebPluginInfo& info) {
+void PluginDataRemover::SetPluginInfo(
+    const webkit::npapi::WebPluginInfo& info) {
 }
 
 void PluginDataRemover::OnChannelOpened(const IPC::ChannelHandle& handle) {
   ConnectToChannel(handle);
   Release();
 }
 
 void PluginDataRemover::ConnectToChannel(const IPC::ChannelHandle& handle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
@@ skipping 56 matching lines @@
   if (done_task_.get()) {
     message_loop_->PostTask(FROM_HERE, done_task_.release());
     message_loop_ = NULL;
   }
 }
 
 // static
 bool PluginDataRemover::IsSupported() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   bool allow_wildcard = false;
-  WebPluginInfo plugin;
+  webkit::npapi::WebPluginInfo plugin;
   std::string mime_type;
-  if (!NPAPI::PluginList::Singleton()->GetPluginInfo(GURL(),
-                                                     g_flash_mime_type,
-                                                     allow_wildcard,
-                                                     &plugin,
-                                                     &mime_type))
+  if (!webkit::npapi::PluginList::Singleton()->GetPluginInfo(GURL(),
+                                                             g_flash_mime_type,
+                                                             allow_wildcard,
+                                                             &plugin,
+                                                             &mime_type))
     return false;
   scoped_ptr<Version> version(
-      PluginGroup::CreateVersionFromString(plugin.version));
+      webkit::npapi::PluginGroup::CreateVersionFromString(plugin.version));
   scoped_ptr<Version> min_version(
       Version::GetVersionFromString(g_min_flash_version));
   return plugin.enabled &&
          version.get() &&
          min_version->CompareTo(*version) == -1;
 }