summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/api/content_settings/content_settings_apitest.cc')
-rw-r--r--chrome/browser/extensions/api/content_settings/content_settings_apitest.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
index f1702cc..8c3bbed 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
@@ -13,7 +13,7 @@
#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 {
@@ -115,16 +115,16 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsGetResourceIdentifiersTest,
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"))