Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3795)

Unified Diff: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

Issue 19894003: Move webplugininfo.h to content/public. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
===================================================================
--- chrome/browser/extensions/api/content_settings/content_settings_apitest.cc (revision 212806)
+++ chrome/browser/extensions/api/content_settings/content_settings_apitest.cc (working copy)
@@ -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 @@
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"))

Powered by Google App Engine
This is Rietveld 408576698