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

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: Added empty group prunning. Created 9 years, 11 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/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 63f76cc904ed90fe876e7e81df0b476aec67a4a4..dfd70b7ed0571c8c89e28b4c63c0933390c0b618 100644
--- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
@@ -66,7 +66,11 @@ class GViewRequestInterceptorTest : public testing::Test {
}
void RegisterPDFPlugin() {
- webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(pdf_path_);
+ webkit::npapi::PluginVersionInfo pdf_plugin;
+ memset(&pdf_plugin.entry_points, 0, sizeof(pdf_plugin.entry_points));
+ pdf_plugin.path = pdf_path_;
+ pdf_plugin.product_name = ASCIIToWide("PDF Plugin");
jam 2011/01/19 20:22:09 is this code still needed, i.e. adding a descripti
pastarmovj 2011/01/19 23:39:17 Actually yes. This plugin has description in it's
jam 2011/01/20 00:24:25 oops, I didn't notice that this is a test file, in
+ webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(pdf_plugin);
webkit::npapi::PluginList::Singleton()->RefreshPlugins();
}
@@ -93,7 +97,7 @@ class GViewRequestInterceptorTest : public testing::Test {
pdf_path_, &info);
}
EXPECT_EQ(want_loaded, is_loaded);
- *out_is_enabled = info.enabled;
+ *out_is_enabled = webkit::npapi::IsPluginEnabled(info);
}
protected:

Powered by Google App Engine
This is Rietveld 408576698