Move webplugininfo.h to content/public.

chrome/browser/chrome_plugin_browsertest.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 <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/process_type.h"
+#include "content/public/common/webplugininfo.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/net_util.h"
 #include "webkit/plugins/plugin_constants.h"
-#include "webkit/plugins/webplugininfo.h"
 
 using content::BrowserThread;
 
 namespace {
 
 class CallbackBarrier : public base::RefCountedThreadSafe<CallbackBarrier> {
  public:
   explicit CallbackBarrier(const base::Closure& target_callback)
       : target_callback_(target_callback),
         outstanding_callbacks_(0),
@@ skipping 58 matching lines @@
         new content::MessageLoopRunner;
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&CrashFlashInternal, runner->QuitClosure()));
     runner->Run();
   }
 
   static void GetFlashPath(std::vector<base::FilePath>* paths) {
     paths->clear();
-    std::vector<webkit::WebPluginInfo> plugins = GetPlugins();
-    for (std::vector<webkit::WebPluginInfo>::const_iterator it =
+    std::vector<content::WebPluginInfo> plugins = GetPlugins();
+    for (std::vector<content::WebPluginInfo>::const_iterator it =
              plugins.begin(); it != plugins.end(); ++it) {
       if (it->name == ASCIIToUTF16(kFlashPluginName))
         paths->push_back(it->path);
     }
   }
 
-  static std::vector<webkit::WebPluginInfo> GetPlugins() {
-    std::vector<webkit::WebPluginInfo> plugins;
+  static std::vector<content::WebPluginInfo> GetPlugins() {
+    std::vector<content::WebPluginInfo> plugins;
     scoped_refptr<content::MessageLoopRunner> runner =
         new content::MessageLoopRunner;
     content::PluginService::GetInstance()->GetPlugins(
         base::Bind(&GetPluginsInfoCallback, &plugins, runner->QuitClosure()));
     runner->Run();
     return plugins;
   }
 
   static void EnableFlash(bool enable, Profile* profile) {
     std::vector<base::FilePath> paths;
@@ skipping 34 matching lines @@
         continue;
       }
       base::KillProcess(iter.GetData().handle, 0, true);
       found = true;
     }
     ASSERT_TRUE(found) << "Didn't find Flash process!";
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, quit_task);
   }
 
   static void GetPluginsInfoCallback(
-      std::vector<webkit::WebPluginInfo>* rv,
+      std::vector<content::WebPluginInfo>* rv,
       const base::Closure& quit_task,
-      const std::vector<webkit::WebPluginInfo>& plugins) {
+      const std::vector<content::WebPluginInfo>& plugins) {
     *rv = plugins;
     quit_task.Run();
   }
 
   static void CountPluginProcesses(int* count, const base::Closure& quit_task) {
     for (content::BrowserChildProcessHostIterator iter; !iter.Done(); ++iter) {
       if (iter.GetData().process_type == content::PROCESS_TYPE_PLUGIN ||
           iter.GetData().process_type == content::PROCESS_TYPE_PPAPI_PLUGIN) {
         (*count)++;
       }
@@ skipping 59 matching lines @@
     "Shockwave Flash",
     "Native Client",
     "Chrome Remote Desktop Viewer",
 #if defined(OS_CHROMEOS)
     "Google Talk Plugin",
     "Google Talk Plugin Video Accelerator",
     "Netflix",
 #endif
   };
 
-  std::vector<webkit::WebPluginInfo> plugins = GetPlugins();
+  std::vector<content::WebPluginInfo> plugins = GetPlugins();
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(expected); ++i) {
     size_t j = 0;
     for (; j < plugins.size(); ++j) {
       if (plugins[j].name == ASCIIToUTF16(expected[i]))
         break;
     }
     ASSERT_TRUE(j != plugins.size()) << "Didn't find " << expected[i];
   }
 }