Policy: Re-enabled plugin still disabled

chrome/browser/chromeos/gview_request_interceptor_unittest.cc

 // Copyright (c) 2011 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 48 matching lines @@
     net::URLRequest::RegisterProtocolFactory("http", NULL);
     message_loop_.RunAllPending();
   }
 
   static net::URLRequestJob* Factory(net::URLRequest* request,
                                      const std::string& scheme) {
     return new GViewURLRequestTestJob(request);
   }
 
   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 description when one doesn't exist to
make it different from placeholder plugins?

[pastarmovj, 2011/01/19 23:39:17]

Actually yes. This plugin has description in it's original PluginList
registrastion. All internal plugins get registered through the
RegisterInternalPlugin function that has 5 params - path, name, desc,
mime-types, entry points. Actually this one RegisterInternalPlugin function that
takes only path is used only in this single unit test suite. That is also why I
removed it from PluginLists. It was not used anywhere else.

[jam, 2011/01/20 00:24:25]

oops, I didn't notice that this is a test file, in that case, ignore my comment.
 I always favor making test code more verbose/ugly over doing the same to
shipping code :)

+    webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(pdf_plugin);
     webkit::npapi::PluginList::Singleton()->RefreshPlugins();
   }
 
   void UnregisterPDFPlugin() {
     webkit::npapi::PluginList::Singleton()->UnregisterInternalPlugin(pdf_path_);
     webkit::npapi::PluginList::Singleton()->RefreshPlugins();
   }
 
   void SetPDFPluginLoadedState(bool want_loaded, bool* out_is_enabled) {
     webkit::npapi::WebPluginInfo info;
     bool is_loaded =
         webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(
             pdf_path_, &info);
     if (is_loaded && !want_loaded) {
       UnregisterPDFPlugin();
       is_loaded = webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(
           pdf_path_, &info);
     } else if (!is_loaded && want_loaded) {
       // This "loads" the plug-in even if it's not present on the
       // system - which is OK since we don't actually use it, just
       // need it to be "enabled" for the test.
       RegisterPDFPlugin();
       is_loaded = webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(
           pdf_path_, &info);
     }
     EXPECT_EQ(want_loaded, is_loaded);
-    *out_is_enabled = info.enabled;
+    *out_is_enabled = webkit::npapi::IsPluginEnabled(info);
   }
 
  protected:
   MessageLoopForIO message_loop_;
   TestDelegate test_delegate_;
   net::URLRequest::Interceptor* interceptor_;
   FilePath pdf_path_;
 };
 
 TEST_F(GViewRequestInterceptorTest, DoNotInterceptHtml) {
@@ skipping 64 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