Remove dead code.

TBR=cpu
Review URL: https://chromiumcodereview.appspot.com/9969005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129825 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 44 deletions

diff --git a/chrome/browser/renderer_host/plugin_info_message_filter.cc b/chrome/browser/renderer_host/plugin_info_message_filter.cc
index 11864a7..13bc7d6 100644
--- a/chrome/browser/renderer_host/plugin_info_message_filter.cc
+++ b/chrome/browser/renderer_host/plugin_info_message_filter.cc
@@ -26,45 +26,8 @@
 #include "chrome/browser/plugin_installer.h"
 #endif
 
-#if defined(OS_WIN)
-// These includes are only necessary for the PluginInfobarExperiment.
-#include "chrome/common/attrition_experiments.h"
-#include "chrome/installer/util/google_update_settings.h"
-#endif
-
 using content::PluginService;
 
-namespace {
-
-// Override the behavior of the security infobars for plugins. Only
-// operational on windows and only for a small slice of the of the
-// UMA opted-in population.
-void PluginInfobarExperiment(bool* allow_outdated,
-                             bool* always_authorize) {
-#if !defined(OS_WIN)
-  return;
-#else
- std::wstring client_value;
- if (!GoogleUpdateSettings::GetClient(&client_value))
-   return;
- if (client_value == attrition_experiments::kPluginNoBlockNoOOD) {
-   *always_authorize = true;
-   *allow_outdated = true;
- } else if (client_value == attrition_experiments::kPluginNoBlockDoOOD) {
-   *always_authorize = true;
-   *allow_outdated = false;
- } else if (client_value == attrition_experiments::kPluginDoBlockNoOOD) {
-   *always_authorize = false;
-   *allow_outdated = true;
- } else if (client_value == attrition_experiments::kPluginDoBlockDoOOD) {
-   *always_authorize = false;
-   *allow_outdated = false;
- }
-#endif
-}
-
-}  // namespace
-
 PluginInfoMessageFilter::Context::Context(int render_process_id,
                                           Profile* profile)
     : render_process_id_(render_process_id),
@@ -195,13 +158,8 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(
                           &uses_default_content_setting);
   DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);
 
-  bool allow_outdated = allow_outdated_plugins_.GetValue();
-  bool always_authorize = always_authorize_plugins_.GetValue();
-
-  PluginInfobarExperiment(&allow_outdated, &always_authorize);
-
   // Check if the plug-in is outdated.
-  if (group->IsVulnerable(plugin) && !allow_outdated) {
+  if (group->IsVulnerable(plugin) && !allow_outdated_plugins_.GetValue()) {
     if (allow_outdated_plugins_.IsManaged()) {
       status->value =
           ChromeViewHostMsg_GetPluginInfo_Status::kOutdatedDisallowed;
@@ -219,7 +177,7 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(
       plugin_finder->FindPluginWithIdentifier(group->identifier());
   if (((installer && installer->requires_authorization()) ||
        PluginService::GetInstance()->IsPluginUnstable(plugin.path)) &&
-      !always_authorize &&
+      !always_authorize_plugins_.GetValue() &&
       plugin_setting != CONTENT_SETTING_BLOCK &&
       uses_default_content_setting) {
     status->value =