summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugins/plugin_prefs_unittest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-21 04:29:20 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-21 04:29:20 +0000
commitd7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a (patch)
tree58b9de096179d94ab1fa05470340709e76cfdf49 /chrome/browser/plugins/plugin_prefs_unittest.cc
parentec7293192cc51edb8a89f084a165d384f5f82ab9 (diff)
downloadchromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.zip
chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.tar.gz
chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.tar.bz2
Move webplugininfo.h to content/public.
BUG=237249 TBR=scottmg Review URL: https://codereview.chromium.org/19894003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugins/plugin_prefs_unittest.cc')
-rw-r--r--chrome/browser/plugins/plugin_prefs_unittest.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/plugins/plugin_prefs_unittest.cc b/chrome/browser/plugins/plugin_prefs_unittest.cc
index 40d2558..53e148d 100644
--- a/chrome/browser/plugins/plugin_prefs_unittest.cc
+++ b/chrome/browser/plugins/plugin_prefs_unittest.cc
@@ -14,10 +14,10 @@
#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;
@@ -48,7 +48,7 @@ base::FilePath GetBundledPepperFlashPath() {
}
void GotPlugins(const base::Closure& quit_closure,
- const std::vector<webkit::WebPluginInfo>& plugins) {
+ const std::vector<content::WebPluginInfo>& plugins) {
quit_closure.Run();
}
@@ -196,20 +196,20 @@ TEST_F(PluginPrefsTest, UnifiedPepperFlashState) {
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);