Move webplugininfo.h to content/public.

content/browser/plugin_data_remover_impl.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/browser/plugin_data_remover_impl.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
@@ skipping 23 matching lines @@
 
 }  // namespace
 
 // static
 PluginDataRemover* PluginDataRemover::Create(BrowserContext* browser_context) {
   return new PluginDataRemoverImpl(browser_context);
 }
 
 // static
 void PluginDataRemover::GetSupportedPlugins(
-    std::vector<webkit::WebPluginInfo>* supported_plugins) {
+    std::vector<WebPluginInfo>* supported_plugins) {
   bool allow_wildcard = false;
-  std::vector<webkit::WebPluginInfo> plugins;
+  std::vector<WebPluginInfo> plugins;
   PluginService::GetInstance()->GetPluginInfoArray(
       GURL(), kFlashPluginSwfMimeType, allow_wildcard, &plugins, NULL);
   Version min_version(kMinFlashVersion);
-  for (std::vector<webkit::WebPluginInfo>::iterator it = plugins.begin();
+  for (std::vector<WebPluginInfo>::iterator it = plugins.begin();
        it != plugins.end(); ++it) {
     Version version;
-    webkit::WebPluginInfo::CreateVersionFromString(it->version, &version);
+    WebPluginInfo::CreateVersionFromString(it->version, &version);
     if (version.IsValid() && min_version.CompareTo(version) == -1)
       supported_plugins->push_back(*it);
   }
 }
 
 class PluginDataRemoverImpl::Context
     : public PluginProcessHost::Client,
       public PpapiPluginProcessHost::BrokerClient,
       public IPC::Listener,
       public base::RefCountedThreadSafe<Context,
@@ skipping 17 matching lines @@
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&Context::OnTimeout, this),
         base::TimeDelta::FromMilliseconds(kRemovalTimeoutMs));
   }
 
   void InitOnIOThread(const std::string& mime_type) {
     PluginServiceImpl* plugin_service = PluginServiceImpl::GetInstance();
 
     // Get the plugin file path.
-    std::vector<webkit::WebPluginInfo> plugins;
+    std::vector<WebPluginInfo> plugins;
     plugin_service->GetPluginInfoArray(
         GURL(), mime_type, false, &plugins, NULL);
     base::FilePath plugin_path;
     if (!plugins.empty())  // May be empty for some tests.
       plugin_path = plugins[0].path;
 
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     remove_start_time_ = base::Time::Now();
     is_removing_ = true;
     // Balanced in On[Ppapi]ChannelOpened or OnError. Exactly one them will
@@ skipping 26 matching lines @@
   }
 
   virtual bool OffTheRecord() OVERRIDE {
     return false;
   }
 
   virtual ResourceContext* GetResourceContext() OVERRIDE {
     return resource_context_;
   }
 
-  virtual void SetPluginInfo(const webkit::WebPluginInfo& info) OVERRIDE {}
+  virtual void SetPluginInfo(const WebPluginInfo& info) OVERRIDE {}
 
   virtual void OnFoundPluginProcessHost(PluginProcessHost* host) OVERRIDE {}
 
   virtual void OnSentPluginChannelRequest() OVERRIDE {}
 
   virtual void OnChannelOpened(const IPC::ChannelHandle& handle) OVERRIDE {
     ConnectToChannel(handle, false);
     // Balancing the AddRef call.
     Release();
   }
@@ skipping 160 matching lines @@
 
 base::WaitableEvent* PluginDataRemoverImpl::StartRemoving(
     base::Time begin_time) {
   DCHECK(!context_.get());
   context_ = new Context(begin_time, browser_context_);
   context_->Init(mime_type_);
   return context_->event();
 }
 
 }  // namespace content