Follow-on fixes and naming changes for https://codereview.chromium.org/12086077/

chrome/browser/plugins/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/plugins/plugin_info_message_filter.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
@@ skipping 115 matching lines @@
                                  &plugin_metadata)) {
     context_.DecidePluginStatus(params, output.plugin, plugin_metadata.get(),
                                 &output.status);
   }
 
   if (plugin_metadata) {
     output.group_identifier = plugin_metadata->identifier();
     output.group_name = plugin_metadata->name();
   }
 
-  context_.GrantAccess(output.status, output.plugin.path);
+  context_.MaybeGrantAccess(output.status, output.plugin.path);
 
   ChromeViewHostMsg_GetPluginInfo::WriteReplyParams(reply_msg, output);
   Send(reply_msg);
 }
 
 void PluginInfoMessageFilter::Context::DecidePluginStatus(
     const GetPluginInfo_Params& params,
     const WebPluginInfo& plugin,
     const PluginMetadata* plugin_metadata,
     ChromeViewHostMsg_GetPluginInfo_Status* status) const {
@@ skipping 74 matching lines @@
       url, mime_type, allow_wildcard, &matching_plugins, &mime_types);
   if (matching_plugins.empty()) {
     status->value = ChromeViewHostMsg_GetPluginInfo_Status::kNotFound;
     return false;
   }
 
   content::PluginServiceFilter* filter =
       PluginService::GetInstance()->GetFilter();
   size_t i = 0;
   for (; i < matching_plugins.size(); ++i) {
-    if (!filter || filter->IsPluginEnabled(render_process_id_,
-                                           render_view_id,
-                                           resource_context_,
-                                           url,
-                                           top_origin_url,
-                                           &matching_plugins[i])) {
+    if (!filter || filter->IsPluginAvailable(render_process_id_,
+                                             render_view_id,
+                                             resource_context_,
+                                             url,
+                                             top_origin_url,
+                                             &matching_plugins[i])) {
       break;
     }
   }
 
   // If we broke out of the loop, we have found an enabled plug-in.
   bool enabled = i < matching_plugins.size();
   if (!enabled) {
     // Otherwise, we only found disabled plug-ins, so we take the first one.
     i = 0;
     status->value = ChromeViewHostMsg_GetPluginInfo_Status::kDisabled;
@@ skipping 39 matching lines @@
           &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();
 }
 
-void PluginInfoMessageFilter::Context::GrantAccess(
+void PluginInfoMessageFilter::Context::MaybeGrantAccess(
     const ChromeViewHostMsg_GetPluginInfo_Status& status,
     const FilePath& path) const {
   if (status.value == ChromeViewHostMsg_GetPluginInfo_Status::kAllowed ||
       status.value == ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay) {
     ChromePluginServiceFilter::GetInstance()->AuthorizePlugin(
         render_process_id_, path);
   }
 }