Merge 158364 - Handle crashing Pepper plug-ins the same as crashing NPAPI plug-ins.

chrome/browser/renderer_host/plugin_info_message_filter.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/renderer_host/plugin_info_message_filter.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
@@ skipping 168 matching lines @@
     if (allow_outdated_plugins_.IsManaged()) {
       status->value =
           ChromeViewHostMsg_GetPluginInfo_Status::kOutdatedDisallowed;
     } else {
       status->value = ChromeViewHostMsg_GetPluginInfo_Status::kOutdatedBlocked;
     }
     return;
   }
 
   // Check if the plug-in requires authorization.
-  if ((plugin_status ==
-           PluginInstaller::SECURITY_STATUS_REQUIRES_AUTHORIZATION ||
-       PluginService::GetInstance()->IsPluginUnstable(plugin.path)) &&
+  if (plugin_status ==
+          PluginInstaller::SECURITY_STATUS_REQUIRES_AUTHORIZATION &&
       plugin.type != WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS &&
       plugin.type != WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS &&
       !always_authorize_plugins_.GetValue() &&
       plugin_setting != CONTENT_SETTING_BLOCK &&
       uses_default_content_setting) {
     status->value = ChromeViewHostMsg_GetPluginInfo_Status::kUnauthorized;
     return;
   }
+
+  // Check if the plug-in is crashing too much.
+  if (PluginService::GetInstance()->IsPluginUnstable(plugin.path) &&
+      !always_authorize_plugins_.GetValue() &&
+      plugin_setting != CONTENT_SETTING_BLOCK &&
+      uses_default_content_setting) {
+    status->value = ChromeViewHostMsg_GetPluginInfo_Status::kUnauthorized;
+    return;
+  }
 #endif
 
   if (plugin_setting == CONTENT_SETTING_ASK)
     status->value = ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay;
   else if (plugin_setting == CONTENT_SETTING_BLOCK)
     status->value = ChromeViewHostMsg_GetPluginInfo_Status::kBlocked;
 }
 
 bool PluginInfoMessageFilter::Context::FindEnabledPlugin(
     int render_view_id,
@@ skipping 71 matching lines @@
           policy_url, plugin_url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string(),
           &info));
     }
   }
   *setting = content_settings::ValueToContentSetting(value.get());
   *uses_default_content_setting =
       !uses_plugin_specific_setting &&
       info.primary_pattern == ContentSettingsPattern::Wildcard() &&
       info.secondary_pattern == ContentSettingsPattern::Wildcard();
 }