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

Unified Diff: chrome/browser/chromeos/gview_request_interceptor_unittest.cc

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More fixes and cleanups. Created 10 years 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/chromeos/gview_request_interceptor_unittest.cc
diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
index ef6606110eae8d1fa253a475fb1c397d798cf53d..03f11695975d4b2369211519d1110f3c9e985c41 100644
--- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
@@ -68,6 +68,7 @@ class GViewRequestInterceptorTest : public testing::Test {
void RegisterPDFPlugin() {
NPAPI::PluginVersionInfo info;
info.path = pdf_path_;
+ info.product_name = UTF8ToWide("PDF Internal Plugin");
memset(&info.entry_points, 0, sizeof(info.entry_points));
NPAPI::PluginList::Singleton()->RegisterInternalPlugin(info);
NPAPI::PluginList::Singleton()->RefreshPlugins();
@@ -128,7 +129,7 @@ TEST_F(GViewRequestInterceptorTest, DoNotInterceptPdfWhenEnabled) {
if (!enabled) {
bool pdf_plugin_enabled =
- NPAPI::PluginList::Singleton()->EnablePlugin(pdf_path_);
+ NPAPI::PluginList::Singleton()->EnablePlugin(pdf_path_, string16());
EXPECT_TRUE(pdf_plugin_enabled);
}
@@ -145,7 +146,7 @@ TEST_F(GViewRequestInterceptorTest, InterceptPdfWhenDisabled) {
if (enabled) {
bool pdf_plugin_disabled =
- NPAPI::PluginList::Singleton()->DisablePlugin(pdf_path_);
+ NPAPI::PluginList::Singleton()->DisablePlugin(pdf_path_, string16());
EXPECT_TRUE(pdf_plugin_disabled);
}

Powered by Google App Engine
This is Rietveld 408576698