diff options
author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 03:24:11 +0000 |
---|---|---|
committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 03:24:11 +0000 |
commit | 87dc10728e23c1e4fc42714823cab768da4d4006 (patch) | |
tree | a207df7edbb6817b90ee432b735c535351e1fcf1 /chrome/browser | |
parent | e32b4e8219c05d93a262c7d586e8302e9810ee47 (diff) | |
download | chromium_src-87dc10728e23c1e4fc42714823cab768da4d4006.zip chromium_src-87dc10728e23c1e4fc42714823cab768da4d4006.tar.gz chromium_src-87dc10728e23c1e4fc42714823cab768da4d4006.tar.bz2 |
Remove plug-in infobar experiment, basically a revert of the revisions noted
in the bug. Revert was done manually due to refactoring, etc.
BUG=85988
Review URL: https://chromiumcodereview.appspot.com/9802030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/renderer_host/plugin_info_message_filter.cc | 39 |
1 files changed, 0 insertions, 39 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..31770be 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), @@ -198,8 +161,6 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus( 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 (allow_outdated_plugins_.IsManaged()) { |