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

content/browser/renderer_host/render_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 "content/browser/renderer_host/render_message_filter.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 655 matching lines @@
     const std::vector<webkit::WebPluginInfo>& all_plugins) {
   // Filter the plugin list.
   PluginServiceFilter* filter = PluginServiceImpl::GetInstance()->GetFilter();
   std::vector<webkit::WebPluginInfo> plugins;
 
   int child_process_id = -1;
   int routing_id = MSG_ROUTING_NONE;
   for (size_t i = 0; i < all_plugins.size(); ++i) {
     // Copy because the filter can mutate.
     webkit::WebPluginInfo plugin(all_plugins[i]);
-    if (!filter || filter->IsPluginEnabled(child_process_id,
-                                           routing_id,
-                                           resource_context_,
-                                           GURL(),
-                                           GURL(),
-                                           &plugin)) {
+    if (!filter || filter->IsPluginAvailable(child_process_id,
+                                             routing_id,
+                                             resource_context_,
+                                             GURL(),
+                                             GURL(),
+                                             &plugin)) {
       plugins.push_back(plugin);
     }
   }
 
   ViewHostMsg_GetPlugins::WriteReplyParams(reply_msg, plugins);
   Send(reply_msg);
 }
 
 void RenderMessageFilter::OnGetPluginInfo(
     int routing_id,
@@ skipping 455 matching lines @@
 
   HENHMETAFILE metafile = CloseEnhMetaFile(hdc);
 
   if (metafile) {
     DeleteEnhMetaFile(metafile);
   }
 }
 #endif
 
 }  // namespace content