Remove NPAPI from browser and utility

chrome/browser/plugins/chrome_plugin_service_filter.cc

Index: chrome/browser/plugins/chrome_plugin_service_filter.cc
diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc
index bba8b48a89933c541059b51ace164920a90f8e75..e815629fc14351c8d7de056473ca9d53db05a109 100644
--- a/chrome/browser/plugins/chrome_plugin_service_filter.cc
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.cc
@@ -41,149 +41,11 @@ using content::PluginService;
 
 namespace {
 
-// This enum is recorded in a histogram so entries should not be re-ordered or
-// removed.
-enum PluginGroup {
-  GROUP_NAME_UNKNOWN,
-  GROUP_NAME_ADOBE_READER,
-  GROUP_NAME_JAVA,
-  GROUP_NAME_QUICKTIME,
-  GROUP_NAME_SHOCKWAVE,
-  GROUP_NAME_REALPLAYER,
-  GROUP_NAME_SILVERLIGHT,
-  GROUP_NAME_WINDOWS_MEDIA_PLAYER,
-  GROUP_NAME_GOOGLE_TALK,
-  GROUP_NAME_GOOGLE_EARTH,
-  GROUP_NAME_COUNT,
-};
-
-static const char kLearnMoreUrl[] =
-    "https://support.google.com/chrome/answer/6213033";
-
 void AuthorizeRenderer(content::RenderFrameHost* render_frame_host) {
   ChromePluginServiceFilter::GetInstance()->AuthorizePlugin(
       render_frame_host->GetProcess()->GetID(), base::FilePath());
 }
 
-class NPAPIRemovalInfoBarDelegate : public ConfirmInfoBarDelegate {
- public:
-  static void Create(InfoBarService* infobar_service,
-                     const base::string16& plugin_name,
-                     bool is_removed);
-
- private:
-  NPAPIRemovalInfoBarDelegate(const base::string16& plugin_name,
-                              int message_id);
-  ~NPAPIRemovalInfoBarDelegate() override;
-
-  // ConfirmInfobarDelegate:
-  infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
-  int GetIconId() const override;
-  base::string16 GetMessageText() const override;
-  int GetButtons() const override;
-  base::string16 GetLinkText() const override;
-  GURL GetLinkURL() const override;
-  bool LinkClicked(WindowOpenDisposition disposition) override;
-
-  base::string16 plugin_name_;
-  int message_id_;
-};
-
-// static
-void NPAPIRemovalInfoBarDelegate::Create(InfoBarService* infobar_service,
-                                         const base::string16& plugin_name,
-                                         bool is_removed) {
-  int message_id = is_removed ? IDS_PLUGINS_NPAPI_REMOVED
-                              : IDS_PLUGINS_NPAPI_BEING_REMOVED_SOON;
-
-  infobar_service->AddInfoBar(
-      infobar_service->CreateConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
-          new NPAPIRemovalInfoBarDelegate(plugin_name, message_id))));
-}
-
-NPAPIRemovalInfoBarDelegate::NPAPIRemovalInfoBarDelegate(
-    const base::string16& plugin_name,
-    int message_id)
-    : plugin_name_(plugin_name), message_id_(message_id) {
-  content::RecordAction(UserMetricsAction("NPAPIRemovalInfobar.Shown"));
-
-  std::pair<PluginGroup, const char*> types[] = {
-      std::make_pair(GROUP_NAME_ADOBE_READER,
-                     PluginMetadata::kAdobeReaderGroupName),
-      std::make_pair(GROUP_NAME_JAVA,
-                     PluginMetadata::kJavaGroupName),
-      std::make_pair(GROUP_NAME_QUICKTIME,
-                     PluginMetadata::kQuickTimeGroupName),
-      std::make_pair(GROUP_NAME_SHOCKWAVE,
-                     PluginMetadata::kShockwaveGroupName),
-      std::make_pair(GROUP_NAME_REALPLAYER,
-                     PluginMetadata::kRealPlayerGroupName),
-      std::make_pair(GROUP_NAME_SILVERLIGHT,
-                     PluginMetadata::kSilverlightGroupName),
-      std::make_pair(GROUP_NAME_WINDOWS_MEDIA_PLAYER,
-                     PluginMetadata::kWindowsMediaPlayerGroupName),
-      std::make_pair(GROUP_NAME_GOOGLE_TALK,
-                     PluginMetadata::kGoogleTalkGroupName),
-      std::make_pair(GROUP_NAME_GOOGLE_EARTH,
-                     PluginMetadata::kGoogleEarthGroupName)};
-
-  PluginGroup group = GROUP_NAME_UNKNOWN;
-  std::string name = base::UTF16ToUTF8(plugin_name);
-
-  for (const auto& type : types) {
-    if (name == type.second) {
-      group = type.first;
-      break;
-    }
-  }
-
-  if (message_id == IDS_PLUGINS_NPAPI_REMOVED) {
-    UMA_HISTOGRAM_ENUMERATION(
-        "Plugin.NpapiRemovalInfobar.Removed.PluginGroup", group,
-        GROUP_NAME_COUNT);
-  } else {
-    DCHECK_EQ(IDS_PLUGINS_NPAPI_BEING_REMOVED_SOON, message_id);
-    UMA_HISTOGRAM_ENUMERATION(
-        "Plugin.NpapiRemovalInfobar.RemovedSoon.PluginGroup", group,
-        GROUP_NAME_COUNT);
-  }
-}
-
-NPAPIRemovalInfoBarDelegate::~NPAPIRemovalInfoBarDelegate() {
-}
-
-infobars::InfoBarDelegate::InfoBarIdentifier
-NPAPIRemovalInfoBarDelegate::GetIdentifier() const {
-  return NPAPI_REMOVAL_INFOBAR_DELEGATE;
-}
-
-int NPAPIRemovalInfoBarDelegate::GetIconId() const {
-  return IDR_INFOBAR_WARNING;
-}
-
-base::string16 NPAPIRemovalInfoBarDelegate::GetMessageText() const {
-  return l10n_util::GetStringFUTF16(message_id_, plugin_name_);
-}
-
-int NPAPIRemovalInfoBarDelegate::GetButtons() const {
-  return BUTTON_NONE;
-}
-
-base::string16 NPAPIRemovalInfoBarDelegate::GetLinkText() const {
-  return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
-}
-
-GURL NPAPIRemovalInfoBarDelegate::GetLinkURL() const {
-  return GURL(kLearnMoreUrl);
-}
-
-bool NPAPIRemovalInfoBarDelegate::LinkClicked(
-    WindowOpenDisposition disposition) {
-  content::RecordAction(UserMetricsAction("NPAPIRemovalInfobar.LearnMore"));
-  ConfirmInfoBarDelegate::LinkClicked(disposition);
-  return true;
-}
-
 }  // namespace
 
 // static
@@ -219,27 +81,6 @@ void ChromePluginServiceFilter::OverridePluginForFrame(
   details->overridden_plugins.push_back(overridden_plugin);
 }
 
-void ChromePluginServiceFilter::RestrictPluginToProfileAndOrigin(
-    const base::FilePath& plugin_path,
-    Profile* profile,
-    const GURL& origin) {
-  base::AutoLock auto_lock(lock_);
-  restricted_plugins_[plugin_path] =
-      std::make_pair(PluginPrefs::GetForProfile(profile).get(), origin);
-}
-
-void ChromePluginServiceFilter::UnrestrictPlugin(
-    const base::FilePath& plugin_path) {
-  base::AutoLock auto_lock(lock_);
-  restricted_plugins_.erase(plugin_path);
-}
-
-bool ChromePluginServiceFilter::IsPluginRestricted(
-    const base::FilePath& plugin_path) {
-  base::AutoLock auto_lock(lock_);
-  return restricted_plugins_.find(plugin_path) != restricted_plugins_.end();
-}
-
 bool ChromePluginServiceFilter::IsPluginAvailable(
     int render_process_id,
     int render_frame_id,
@@ -273,54 +114,9 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
   if (!plugin_prefs->IsPluginEnabled(*plugin))
     return false;
 
-  // Check whether the plugin is restricted to a URL.
-  RestrictedPluginMap::const_iterator it =
-      restricted_plugins_.find(plugin->path);
-  if (it != restricted_plugins_.end()) {
-    if (it->second.first != plugin_prefs)
-      return false;
-    const GURL& origin = it->second.second;
-    if (!origin.is_empty() &&
-        (policy_url.scheme_piece() != origin.scheme_piece() ||
-         policy_url.host_piece() != origin.host_piece() ||
-         policy_url.port_piece() != origin.port_piece())) {
-      return false;
-    }
-  }
-
   return true;
 }
 
-void ChromePluginServiceFilter::NPAPIPluginLoaded(
-    int render_process_id,
-    int render_frame_id,
-    const std::string& mime_type,
-    const content::WebPluginInfo& plugin) {
-  PluginFinder* finder = PluginFinder::GetInstance();
-  scoped_ptr<PluginMetadata> metadata(finder->GetPluginMetadata(plugin));
-
-  // Singleton will outlive message loop so safe to use base::Unretained here.
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&ChromePluginServiceFilter::ShowNPAPIInfoBar,
-                 base::Unretained(this), render_process_id, render_frame_id,
-                 metadata->name(), mime_type, false));
-}
-
-#if defined(OS_WIN) || defined(OS_MACOSX)
-void ChromePluginServiceFilter::NPAPIPluginNotFound(
-    int render_process_id,
-    int render_frame_id,
-    const std::string& mime_type) {
-  // Singleton will outlive message loop so safe to use base::Unretained here.
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&ChromePluginServiceFilter::ShowNPAPIInfoBar,
-                 base::Unretained(this), render_process_id, render_frame_id,
-                 base::string16(), mime_type, true));
-}
-#endif
-
 bool ChromePluginServiceFilter::CanLoadPlugin(int render_process_id,
                                               const base::FilePath& path) {
   // The browser itself sometimes loads plugins to e.g. clear plugin data.
@@ -337,45 +133,6 @@ bool ChromePluginServiceFilter::CanLoadPlugin(int render_process_id,
           ContainsKey(details->authorized_plugins, base::FilePath()));
 }
 
-void ChromePluginServiceFilter::ShowNPAPIInfoBar(int render_process_id,
-                                                 int render_frame_id,
-                                                 const base::string16& name,
-                                                 const std::string& mime_type,
-                                                 bool is_removed) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  auto ret = infobared_plugin_mime_types_.insert(mime_type);
-
-  // Only display infobar once per mime type.
-  if (!ret.second)
-    return;
-
-  base::string16 plugin_name(name);
-
-  if (plugin_name.empty()) {
-    plugin_name =
-        PluginFinder::GetInstance()->FindPluginName(mime_type, "en-US");
-  }
-
-  content::RenderFrameHost* render_frame_host =
-      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
-
-  content::WebContents* tab =
-      content::WebContents::FromRenderFrameHost(render_frame_host);
-
-  // WebContents could have been destroyed between posting and running the task
-  // on the UI thread, so explicit check here.
-  if (!tab)
-    return;
-
-  InfoBarService* infobar_service = InfoBarService::FromWebContents(tab);
-
-  // NPAPI plugins can load inside extensions and if so there is nowhere to
-  // display the infobar.
-  if (infobar_service)
-    NPAPIRemovalInfoBarDelegate::Create(infobar_service, plugin_name,
-                                        is_removed);
-}
-
 void ChromePluginServiceFilter::AuthorizePlugin(
     int render_process_id,
     const base::FilePath& plugin_path) {