Remove PluginGroup

chrome/browser/plugin_infobar_delegates.cc

 // Copyright (c) 2012 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/plugin_infobar_delegates.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/plugin_metadata.h"
 #include "chrome/browser/plugin_observer.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "webkit/plugins/npapi/plugin_group.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include "ui/base/win/shell.h"
 #endif
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 #include "chrome/browser/plugin_installer.h"
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)
 
@@ skipping 43 matching lines @@
 
 UnauthorizedPluginInfoBarDelegate::UnauthorizedPluginInfoBarDelegate(
     InfoBarService* infobar_service,
     HostContentSettingsMap* content_settings,
     const string16& utf16_name,
     const std::string& identifier)
     : PluginInfoBarDelegate(infobar_service, utf16_name, identifier),
       content_settings_(content_settings) {
   content::RecordAction(UserMetricsAction("BlockedPluginInfobar.Shown"));
   std::string name = UTF16ToUTF8(utf16_name);
-  if (name == webkit::npapi::PluginGroup::kJavaGroupName)
+  if (name == PluginMetadata::kJavaGroupName)
     content::RecordAction(
         UserMetricsAction("BlockedPluginInfobar.Shown.Java"));
-  else if (name == webkit::npapi::PluginGroup::kQuickTimeGroupName)
+  else if (name == PluginMetadata::kQuickTimeGroupName)
     content::RecordAction(
         UserMetricsAction("BlockedPluginInfobar.Shown.QuickTime"));
-  else if (name == webkit::npapi::PluginGroup::kShockwaveGroupName)
+  else if (name == PluginMetadata::kShockwaveGroupName)
     content::RecordAction(
         UserMetricsAction("BlockedPluginInfobar.Shown.Shockwave"));
-  else if (name == webkit::npapi::PluginGroup::kRealPlayerGroupName)
+  else if (name == PluginMetadata::kRealPlayerGroupName)
     content::RecordAction(
         UserMetricsAction("BlockedPluginInfobar.Shown.RealPlayer"));
-  else if (name == webkit::npapi::PluginGroup::kWindowsMediaPlayerGroupName)
+  else if (name == PluginMetadata::kWindowsMediaPlayerGroupName)
     content::RecordAction(
         UserMetricsAction("BlockedPluginInfobar.Shown.WindowsMediaPlayer"));
 }
 
 UnauthorizedPluginInfoBarDelegate::~UnauthorizedPluginInfoBarDelegate() {
   content::RecordAction(UserMetricsAction("BlockedPluginInfobar.Closed"));
 }
 
 std::string UnauthorizedPluginInfoBarDelegate::GetLearnMoreURL() const {
   return chrome::kBlockedPluginLearnMoreURL;
@@ skipping 66 matching lines @@
     PluginInstaller* installer,
     const string16& message)
     : PluginInfoBarDelegate(InfoBarService::ForTab(observer->tab_contents()),
           installer->name(),
           installer->identifier()),
       WeakPluginInstallerObserver(installer),
       observer_(observer),
       message_(message) {
   content::RecordAction(UserMetricsAction("OutdatedPluginInfobar.Shown"));
   std::string name = UTF16ToUTF8(installer->name());
-  if (name == webkit::npapi::PluginGroup::kJavaGroupName)
+  if (name == PluginMetadata::kJavaGroupName)
     content::RecordAction(
         UserMetricsAction("OutdatedPluginInfobar.Shown.Java"));
-  else if (name == webkit::npapi::PluginGroup::kQuickTimeGroupName)
+  else if (name == PluginMetadata::kQuickTimeGroupName)
     content::RecordAction(
         UserMetricsAction("OutdatedPluginInfobar.Shown.QuickTime"));
-  else if (name == webkit::npapi::PluginGroup::kShockwaveGroupName)
+  else if (name == PluginMetadata::kShockwaveGroupName)
     content::RecordAction(
         UserMetricsAction("OutdatedPluginInfobar.Shown.Shockwave"));
-  else if (name == webkit::npapi::PluginGroup::kRealPlayerGroupName)
+  else if (name == PluginMetadata::kRealPlayerGroupName)
     content::RecordAction(
         UserMetricsAction("OutdatedPluginInfobar.Shown.RealPlayer"));
-  else if (name == webkit::npapi::PluginGroup::kSilverlightGroupName)
+  else if (name == PluginMetadata::kSilverlightGroupName)
     content::RecordAction(
         UserMetricsAction("OutdatedPluginInfobar.Shown.Silverlight"));
-  else if (name == webkit::npapi::PluginGroup::kAdobeReaderGroupName)
+  else if (name == PluginMetadata::kAdobeReaderGroupName)
     content::RecordAction(
         UserMetricsAction("OutdatedPluginInfobar.Shown.Reader"));
 }
 
 OutdatedPluginInfoBarDelegate::~OutdatedPluginInfoBarDelegate() {
   content::RecordAction(UserMetricsAction("OutdatedPluginInfobar.Closed"));
 }
 
 std::string OutdatedPluginInfoBarDelegate::GetLearnMoreURL() const {
   return chrome::kOutdatedPluginLearnMoreURL;
@@ skipping 269 matching lines @@
       "https://support.google.com/chrome/?ib_display_in_desktop"));
   OpenURLParams params(
       url, Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false);
   owner()->GetWebContents()->OpenURL(params);
   return false;
 }
 #endif  // defined(OS_WIN)
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)