Add PluginServiceFilter interface.

chrome/browser/pdf_unsupported_feature.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 "chrome/browser/pdf_unsupported_feature.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/plugin_prefs.h"
+#include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/chrome_interstitial_page.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
@@ skipping 109 matching lines @@
 void OpenReaderUpdateURL(TabContents* tab) {
   tab->OpenURL(GURL(kReaderUpdateUrl), GURL(), CURRENT_TAB,
                PageTransition::LINK);
 }
 
 // Opens the PDF using Adobe Reader.
 void OpenUsingReader(TabContentsWrapper* tab,
                      const WebPluginInfo& reader_plugin,
                      InfoBarDelegate* old_delegate,
                      InfoBarDelegate* new_delegate) {
-  PluginService::OverriddenPlugin plugin;
-  plugin.render_process_id = tab->render_view_host()->process()->id();
-  plugin.render_view_id = tab->render_view_host()->routing_id();
-  plugin.url = tab->tab_contents()->GetURL();
-  plugin.plugin = reader_plugin;
+  WebPluginInfo plugin = reader_plugin;
   // The plugin is disabled, so enable it to get around the renderer check.
   // Also give it a new version so that the renderer doesn't show the blocked
   // plugin UI if it's vulnerable, since we already went through the
   // interstitial.
-  plugin.plugin.enabled = WebPluginInfo::USER_ENABLED;
-  plugin.plugin.version = ASCIIToUTF16("11.0.0.0");
+  plugin.enabled = WebPluginInfo::USER_ENABLED;
+  plugin.version = ASCIIToUTF16("11.0.0.0");
 
-  PluginService::GetInstance()->OverridePluginForTab(plugin);
+  ChromePluginServiceFilter::GetInstance()->OverridePluginForTab(
+      tab->render_view_host()->process()->id(),
+      tab->render_view_host()->routing_id(),
+      tab->tab_contents()->GetURL(),
+      plugin);
   tab->render_view_host()->Send(new ViewMsg_ReloadFrame(
       tab->render_view_host()->routing_id()));
 
   if (new_delegate) {
     if (old_delegate) {
       tab->infobar_tab_helper()->ReplaceInfoBar(old_delegate, new_delegate);
     } else {
       tab->infobar_tab_helper()->AddInfoBar(new_delegate);
     }
   }
@@ skipping 207 matching lines @@
   return;
 #endif
   string16 reader_group_name(ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName));
 
   // If the Reader plugin is disabled by policy, don't prompt them.
   if (PluginGroup::IsPluginNameDisabledByPolicy(reader_group_name))
     return;
 
   PluginGroup* reader_group = NULL;
   std::vector<PluginGroup> plugin_groups;
-  PluginList::Singleton()->GetPluginGroups(
-      false, &plugin_groups);
+  PluginList::Singleton()->GetPluginGroups(false, &plugin_groups);
   for (size_t i = 0; i < plugin_groups.size(); ++i) {
     if (plugin_groups[i].GetGroupName() == reader_group_name) {
       reader_group = &plugin_groups[i];
       break;
     }
   }
 
   tab->infobar_tab_helper()->AddInfoBar(
       new PDFUnsupportedFeatureInfoBarDelegate(tab, reader_group));
 }