Policy: Re-enabled plugin still disabled

chrome/browser/chromeos/gview_request_interceptor_unittest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "net/base/load_flags.h"
@@ skipping 50 matching lines @@
   }
 
   static net::URLRequestJob* Factory(net::URLRequest* request,
                                      const std::string& scheme) {
     return new GViewURLRequestTestJob(request);
   }
 
   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();
   }
 
   void UnregisterPDFPlugin() {
     webkit::npapi::PluginList::Singleton()->UnregisterInternalPlugin(pdf_path_);
     webkit::npapi::PluginList::Singleton()->RefreshPlugins();
   }
 
@@ skipping 41 matching lines @@
   EXPECT_EQ(0, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL("http://foo.com/file.pdf"), request.url());
 }
 
 TEST_F(GViewRequestInterceptorTest, DoNotInterceptPdfWhenEnabled) {
   bool enabled;
   SetPDFPluginLoadedState(true, &enabled);
 
   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);
   }
 
   net::URLRequest request(GURL("http://foo.com/file.pdf"), &test_delegate_);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(0, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL("http://foo.com/file.pdf"), request.url());
 }
 
 TEST_F(GViewRequestInterceptorTest, InterceptPdfWhenDisabled) {
   bool enabled;
   SetPDFPluginLoadedState(true, &enabled);
 
   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);
   }
 
   net::URLRequest request(GURL("http://foo.com/file.pdf"), &test_delegate_);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(1, test_delegate_.received_redirect_count());
   EXPECT_EQ(
       GURL("http://docs.google.com/gview?url=http%3A//foo.com/file.pdf"),
       request.url());
@@ skipping 14 matching lines @@
 TEST_F(GViewRequestInterceptorTest, InterceptPowerpoint) {
   net::URLRequest request(GURL("http://foo.com/file.ppt"), &test_delegate_);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(1, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL("http://docs.google.com/gview?url=http%3A//foo.com/file.ppt"),
                  request.url());
 }
 
 }  // namespace chromeos