Move webplugininfo.h to content/public.

chrome/browser/plugins/plugin_prefs_unittest.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/plugins/plugin_prefs.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/common/webplugininfo.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/plugins/webplugininfo.h"
 
 using content::BrowserThread;
 using content::PluginService;
 
 namespace {
 
 void CanEnablePluginCallback(const base::Closure& quit_closure,
                              bool expected_can_change,
                              bool did_change) {
   EXPECT_EQ(expected_can_change, did_change);
@@ skipping 10 matching lines @@
   return path;
 }
 
 base::FilePath GetBundledPepperFlashPath() {
   base::FilePath path;
   EXPECT_TRUE(PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &path));
   return path;
 }
 
 void GotPlugins(const base::Closure& quit_closure,
-                const std::vector<webkit::WebPluginInfo>& plugins) {
+                const std::vector<content::WebPluginInfo>& plugins) {
   quit_closure.Run();
 }
 
 }  // namespace
 
 class PluginPrefsTest : public ::testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
     plugin_prefs_ = new PluginPrefs();
   }
@@ skipping 127 matching lines @@
 TEST_F(PluginPrefsTest, UnifiedPepperFlashState) {
   base::ShadowingAtExitManager at_exit_manager_;  // Destroys the PluginService.
 
   base::MessageLoop message_loop;
   content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
   PluginService::GetInstance()->Init();
   PluginService::GetInstance()->DisablePluginsDiscoveryForTesting();
 
   string16 component_updated_plugin_name(
       ASCIIToUTF16("Component-updated Pepper Flash"));
-  webkit::WebPluginInfo component_updated_plugin_1(
+  content::WebPluginInfo component_updated_plugin_1(
       component_updated_plugin_name,
       GetComponentUpdatedPepperFlashPath(FILE_PATH_LITERAL("11.3.31.227")),
       ASCIIToUTF16("11.3.31.227"),
       ASCIIToUTF16(""));
-  webkit::WebPluginInfo component_updated_plugin_2(
+  content::WebPluginInfo component_updated_plugin_2(
       component_updated_plugin_name,
       GetComponentUpdatedPepperFlashPath(FILE_PATH_LITERAL("11.3.31.228")),
       ASCIIToUTF16("11.3.31.228"),
       ASCIIToUTF16(""));
-  webkit::WebPluginInfo bundled_plugin(ASCIIToUTF16("Pepper Flash"),
-                                       GetBundledPepperFlashPath(),
-                                       ASCIIToUTF16("11.3.31.229"),
-                                       ASCIIToUTF16(""));
+  content::WebPluginInfo bundled_plugin(ASCIIToUTF16("Pepper Flash"),
+                                        GetBundledPepperFlashPath(),
+                                        ASCIIToUTF16("11.3.31.229"),
+                                        ASCIIToUTF16(""));
 
   PluginService::GetInstance()->RegisterInternalPlugin(
       component_updated_plugin_1, false);
   PluginService::GetInstance()->RegisterInternalPlugin(
       component_updated_plugin_2, false);
   PluginService::GetInstance()->RegisterInternalPlugin(bundled_plugin, false);
 
 #if !defined(OS_WIN)
     // Can't go out of process in unit tests.
     content::RenderProcessHost::SetRunRendererInProcess(true);
@@ skipping 45 matching lines @@
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2));
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(bundled_plugin));
 
   EnablePluginSynchronously(true, bundled_plugin.path, true);
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_1));
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2));
   EXPECT_TRUE(plugin_prefs_->IsPluginEnabled(bundled_plugin));
 }
 
 #endif