Policy: Re-enabled plugin still disabled

chrome/browser/chromeos/gview_request_interceptor_unittest.cc

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 6f9c68e20ece6f92578aa3fbea4fea9fc8e41fea..dd7de003481fa79f560d4d6655b88e88bcd15507 100644
--- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
@@ -68,6 +68,8 @@ class GViewRequestInterceptorTest : public testing::Test {
   void RegisterPDFPlugin() {
     webkit::npapi::PluginVersionInfo info;
     info.path = pdf_path_;
+    info.product_name = UTF8ToWide("PDF Internal Plugin");

[jam, 2010/12/21 19:57:42]

why is this needed here?

[pastarmovj, 2010/12/21 20:31:19]

I use the existence of a description as a marker for proper plugin and not a
placeholder when adding them to the list. This is the only field that is really
supported on all platforms in a clean manner (other than the filename which is
not enough). And the name is needed so that the plugin won't land in a group
called "" because group names are generated from plugin names.

+    info.file_description = UTF8ToWide("PDF Internal Plugin");
     memset(&info.entry_points, 0, sizeof(info.entry_points));
     webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info);
     webkit::npapi::PluginList::Singleton()->RefreshPlugins();
@@ -129,7 +131,8 @@ TEST_F(GViewRequestInterceptorTest, DoNotInterceptPdfWhenEnabled) {
 
   if (!enabled) {
     bool pdf_plugin_enabled =
-        webkit::npapi::PluginList::Singleton()->EnablePlugin(pdf_path_);
+        webkit::npapi::PluginList::Singleton()->EnablePlugin(pdf_path_,
+                                                             string16());
     EXPECT_TRUE(pdf_plugin_enabled);
   }
 
@@ -146,7 +149,8 @@ TEST_F(GViewRequestInterceptorTest, InterceptPdfWhenDisabled) {
 
   if (enabled) {
     bool pdf_plugin_disabled =
-        webkit::npapi::PluginList::Singleton()->DisablePlugin(pdf_path_);
+        webkit::npapi::PluginList::Singleton()->DisablePlugin(pdf_path_,
+                                                              string16());
     EXPECT_TRUE(pdf_plugin_disabled);
   }