Move webplugininfo.h to content/public.

chrome/browser/pepper_flash_settings_manager.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 "chrome/browser/pepper_flash_settings_manager.h"
 
 #include <map>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/prefs/pref_service.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/pepper_flash_settings_helper.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/content_constants.h"
+#include "content/public/common/webplugininfo.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_listener.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "url/gurl.h"
 #include "webkit/plugins/plugin_constants.h"
-#include "webkit/plugins/webplugininfo.h"
 
 using content::BrowserThread;
 
 class PepperFlashSettingsManager::Core
     : public IPC::Listener,
       public base::RefCountedThreadSafe<Core, BrowserThread::DeleteOnIOThread> {
  public:
   Core(base::WeakPtr<PepperFlashSettingsManager> manager,
        content::BrowserContext* browser_context);
 
@@ skipping 351 matching lines @@
                                 iter->max_age);
         break;
     }
   }
 }
 
 void PepperFlashSettingsManager::Core::InitializeOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK_EQ(STATE_UNINITIALIZED, state_);
 
-  webkit::WebPluginInfo plugin_info;
+  content::WebPluginInfo plugin_info;
   if (!PepperFlashSettingsManager::IsPepperFlashInUse(plugin_prefs_.get(),
                                                       &plugin_info)) {
     NotifyErrorFromIOThread();
     return;
   }
 
   base::FilePath profile_path =
       browser_context_path_.Append(content::kPepperDataDirname);
 #if defined(OS_WIN)
   plugin_data_path_ = profile_path.Append(plugin_info.name);
@@ skipping 525 matching lines @@
 }
 
 PepperFlashSettingsManager::~PepperFlashSettingsManager() {
   if (core_.get())
     core_->Detach();
 }
 
 // static
 bool PepperFlashSettingsManager::IsPepperFlashInUse(
     PluginPrefs* plugin_prefs,
-    webkit::WebPluginInfo* plugin_info) {
+    content::WebPluginInfo* plugin_info) {
   if (!plugin_prefs)
     return false;
 
   content::PluginService* plugin_service =
       content::PluginService::GetInstance();
-  std::vector<webkit::WebPluginInfo> plugins;
+  std::vector<content::WebPluginInfo> plugins;
   plugin_service->GetPluginInfoArray(
       GURL(), kFlashPluginSwfMimeType, false, &plugins, NULL);
 
-  for (std::vector<webkit::WebPluginInfo>::iterator iter = plugins.begin();
+  for (std::vector<content::WebPluginInfo>::iterator iter = plugins.begin();
        iter != plugins.end(); ++iter) {
     if (iter->is_pepper_plugin() && plugin_prefs->IsPluginEnabled(*iter)) {
       if (plugin_info)
         *plugin_info = *iter;
       return true;
     }
   }
   return false;
 }
 
@@ skipping 92 matching lines @@
 }
 
 void PepperFlashSettingsManager::OnError(Core* core) {
   DCHECK(core);
   if (core != core_.get())
     return;
 
   core_->Detach();
   core_ = NULL;
 }