Move NPAPI implementation out of webkit/plugins/npapi and into content.

content/plugin/plugin_channel.cc

 // Copyright (c) 2012 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 "content/plugin/plugin_channel.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/process_util.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "build/build_config.h"
 #include "content/child/child_process.h"
+#include "content/child/npapi/plugin_instance.h"
 #include "content/child/plugin_messages.h"
 #include "content/common/plugin_process_messages.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/plugin/webplugin_delegate_stub.h"
 #include "content/plugin/webplugin_proxy.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
 
 #if defined(OS_POSIX)
 #include "base/posix/eintr_wrapper.h"
 #include "ipc/ipc_channel_posix.h"
 #endif
 
 using WebKit::WebBindings;
 
 namespace content {
 
@@ skipping 272 matching lines @@
 void PluginChannel::OnGenerateRouteID(int* route_id) {
   *route_id = GenerateRouteID();
 }
 
 void PluginChannel::OnClearSiteData(const std::string& site,
                                     uint64 flags,
                                     uint64 max_age) {
   bool success = false;
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   base::FilePath path = command_line->GetSwitchValuePath(switches::kPluginPath);
-  scoped_refptr<webkit::npapi::PluginLib> plugin_lib(
-      webkit::npapi::PluginLib::CreatePluginLib(path));
+  scoped_refptr<PluginLib> plugin_lib(PluginLib::CreatePluginLib(path));
   if (plugin_lib.get()) {
     NPError err = plugin_lib->NP_Initialize();
     if (err == NPERR_NO_ERROR) {
       const char* site_str = site.empty() ? NULL : site.c_str();
       err = plugin_lib->NP_ClearSiteData(site_str, flags, max_age);
       std::string site_name =
           site.empty() ? "NULL"
                        : base::StringPrintf("\"%s\"", site_str);
       VLOG(1) << "NPP_ClearSiteData(" << site_name << ", " << flags << ", "
               << max_age << ") returned " << err;
       success = (err == NPERR_NO_ERROR);
     }
   }
   Send(new PluginProcessHostMsg_ClearSiteDataResult(success));
 }
 
 }  // namespace content