Move webplugininfo.h to content/public.

chrome/browser/extensions/api/content_settings/content_settings_apitest.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 "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/plugin_service.h"
-#include "webkit/plugins/webplugininfo.h"
+#include "content/public/common/webplugininfo.h"
 
 namespace extensions {
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   EXPECT_TRUE(RunExtensionTest("content_settings/standard")) << message_;
 
   HostContentSettingsMap* map =
@@ skipping 81 matching lines @@
 IN_PROC_BROWSER_TEST_F(ContentSettingsGetResourceIdentifiersTest,
                        DISABLED_Test) {
   base::FilePath::CharType kFooPath[] =
       FILE_PATH_LITERAL("/plugins/foo.plugin");
   base::FilePath::CharType kBarPath[] =
       FILE_PATH_LITERAL("/plugins/bar.plugin");
   const char* kFooName = "Foo Plugin";
   const char* kBarName = "Bar Plugin";
 
   content::PluginService::GetInstance()->RegisterInternalPlugin(
-      webkit::WebPluginInfo(ASCIIToUTF16(kFooName),
-                            base::FilePath(kFooPath),
-                            ASCIIToUTF16("1.2.3"),
-                            ASCIIToUTF16("foo")),
+      content::WebPluginInfo(ASCIIToUTF16(kFooName),
+                             base::FilePath(kFooPath),
+                             ASCIIToUTF16("1.2.3"),
+                             ASCIIToUTF16("foo")),
       false);
   content::PluginService::GetInstance()->RegisterInternalPlugin(
-    webkit::WebPluginInfo(ASCIIToUTF16(kBarName),
-                            base::FilePath(kBarPath),
-                            ASCIIToUTF16("2.3.4"),
-                            ASCIIToUTF16("bar")),
+    content::WebPluginInfo(ASCIIToUTF16(kBarName),
+                           base::FilePath(kBarPath),
+                           ASCIIToUTF16("2.3.4"),
+                           ASCIIToUTF16("bar")),
       false);
 
   EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))
       << message_;
 }
 
 }  // namespace extensions