Revert 96409 - Speculatively revert r96364, it's the best bet on the NaCL breakage.

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/plugin_updater.h"
+#include "chrome/browser/plugin_prefs.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 86 matching lines @@
 }
 
 string16 PDFEnableAdobeReaderInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_PDF_INFOBAR_QUESTION_ALWAYS_USE_READER);
 }
 
 void PDFEnableAdobeReaderInfoBarDelegate::OnYes() {
   UserMetrics::RecordAction(UserMetricsAction("PDF_EnableReaderInfoBarOK"));
   webkit::npapi::PluginList::Singleton()->EnableGroup(false,
       ASCIIToUTF16(chrome::ChromeContentClient::kPDFPluginName));
-  PluginUpdater* plugin_updater = PluginUpdater::GetInstance();
-  plugin_updater->EnablePluginGroup(true,
-      ASCIIToUTF16(webkit::npapi::PluginGroup::kAdobeReaderGroupName));
   Profile* profile =
       Profile::FromBrowserContext(tab_contents_->browser_context());
-  plugin_updater->UpdatePreferences(profile, 0);
+  PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(profile);
+  plugin_prefs->EnablePluginGroup(
+      true, ASCIIToUTF16(webkit::npapi::PluginGroup::kAdobeReaderGroupName));
+  plugin_prefs->UpdatePreferences(0);
 }
 
 void PDFEnableAdobeReaderInfoBarDelegate::OnNo() {
   UserMetrics::RecordAction(UserMetricsAction("PDF_EnableReaderInfoBarCancel"));
 }
 
 // Launch the url to get the latest Adbobe Reader installer.
 void OpenReaderUpdateURL(TabContents* tab) {
   tab->OpenURL(GURL(kReaderUpdateUrl), GURL(), CURRENT_TAB,
                PageTransition::LINK);
@@ skipping 248 matching lines @@
       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->AddInfoBar(new PDFUnsupportedFeatureInfoBarDelegate(tab, reader_group));
 }