Revert 180600

> Follow-on fixes and naming changes for https://codereview.chromium.org/12086077/
> 
> BUG=172573
> Review URL: https://codereview.chromium.org/12177018

Windows and aura bots are failing, and this is the only CL
in range that had no passing try runs for those tests.
If the bots don't go green, I'll unrevert the revert.

TBR=cevans@chromium.org
Review URL: https://codereview.chromium.org/12210009

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

9 files changed, 50 insertions, 49 deletions

diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc
index 072269f..d96f5f2 100644
--- a/chrome/browser/plugins/chrome_plugin_service_filter.cc
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.cc
@@ -69,7 +69,7 @@ void ChromePluginServiceFilter::UnrestrictPlugin(
   restricted_plugins_.erase(plugin_path);
 }
 
-bool ChromePluginServiceFilter::IsPluginAvailable(
+bool ChromePluginServiceFilter::IsPluginEnabled(
     int render_process_id,
     int render_view_id,
     const void* context,
@@ -87,9 +87,10 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
            details->overridden_plugins[i].url.is_empty())) {
 
         bool use = details->overridden_plugins[i].plugin.path == plugin->path;
-        if (use)
-          *plugin = details->overridden_plugins[i].plugin;
-        return use;
+        if (!use)
+          return false;
+        *plugin = details->overridden_plugins[i].plugin;
+        break;
       }
     }
   }
diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.h b/chrome/browser/plugins/chrome_plugin_service_filter.h
index 6c69b9b..f9104dd 100644
--- a/chrome/browser/plugins/chrome_plugin_service_filter.h
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.h
@@ -58,7 +58,7 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
   void AuthorizeAllPlugins(int render_process_id);
 
   // PluginServiceFilter implementation:
-  virtual bool IsPluginAvailable(
+  virtual bool IsPluginEnabled(
       int render_process_id,
       int render_view_id,
       const void* context,
diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc
index 6b77bc2..bbfcdc5 100644
--- a/chrome/browser/plugins/plugin_info_message_filter.cc
+++ b/chrome/browser/plugins/plugin_info_message_filter.cc
@@ -133,7 +133,7 @@ void PluginInfoMessageFilter::PluginsLoaded(
     output.group_name = plugin_metadata->name();
   }
 
-  context_.MaybeGrantAccess(output.status, output.plugin.path);
+  context_.GrantAccess(output.status, output.plugin.path);
 
   ChromeViewHostMsg_GetPluginInfo::WriteReplyParams(reply_msg, output);
   Send(reply_msg);
@@ -228,12 +228,12 @@ bool PluginInfoMessageFilter::Context::FindEnabledPlugin(
       PluginService::GetInstance()->GetFilter();
   size_t i = 0;
   for (; i < matching_plugins.size(); ++i) {
-    if (!filter || filter->IsPluginAvailable(render_process_id_,
-                                             render_view_id,
-                                             resource_context_,
-                                             url,
-                                             top_origin_url,
-                                             &matching_plugins[i])) {
+    if (!filter || filter->IsPluginEnabled(render_process_id_,
+                                           render_view_id,
+                                           resource_context_,
+                                           url,
+                                           top_origin_url,
+                                           &matching_plugins[i])) {
       break;
     }
   }
@@ -293,7 +293,7 @@ void PluginInfoMessageFilter::Context::GetPluginContentSetting(
       info.secondary_pattern == ContentSettingsPattern::Wildcard();
 }
 
-void PluginInfoMessageFilter::Context::MaybeGrantAccess(
+void PluginInfoMessageFilter::Context::GrantAccess(
     const ChromeViewHostMsg_GetPluginInfo_Status& status,
     const FilePath& path) const {
   if (status.value == ChromeViewHostMsg_GetPluginInfo_Status::kAllowed ||
diff --git a/chrome/browser/plugins/plugin_info_message_filter.h b/chrome/browser/plugins/plugin_info_message_filter.h
index 7e5d866..51c3023 100644
--- a/chrome/browser/plugins/plugin_info_message_filter.h
+++ b/chrome/browser/plugins/plugin_info_message_filter.h
@@ -63,8 +63,8 @@ class PluginInfoMessageFilter : public content::BrowserMessageFilter {
                                  const std::string& resource,
                                  ContentSetting* setting,
                                  bool* is_default) const;
-    void MaybeGrantAccess(const ChromeViewHostMsg_GetPluginInfo_Status& status,
-                          const FilePath& path) const;
+    void GrantAccess(const ChromeViewHostMsg_GetPluginInfo_Status& status,
+                     const FilePath& path) const;
 
    private:
     int render_process_id_;
diff --git a/chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc b/chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc
index 50c0aa8..f33461a 100644
--- a/chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc
+++ b/chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc
@@ -27,12 +27,12 @@ class FakePluginServiceFilter : public content::PluginServiceFilter {
   FakePluginServiceFilter() {}
   virtual ~FakePluginServiceFilter() {}
 
-  virtual bool IsPluginAvailable(int render_process_id,
-                                 int render_view_id,
-                                 const void* context,
-                                 const GURL& url,
-                                 const GURL& policy_url,
-                                 webkit::WebPluginInfo* plugin) OVERRIDE;
+  virtual bool IsPluginEnabled(int render_process_id,
+                               int render_view_id,
+                               const void* context,
+                               const GURL& url,
+                               const GURL& policy_url,
+                               webkit::WebPluginInfo* plugin) OVERRIDE;
 
   virtual bool CanLoadPlugin(int render_process_id,
                              const FilePath& path) OVERRIDE;
@@ -45,12 +45,12 @@ class FakePluginServiceFilter : public content::PluginServiceFilter {
   std::map<FilePath, bool> plugin_state_;
 };
 
-bool FakePluginServiceFilter::IsPluginAvailable(int render_process_id,
-                                                int render_view_id,
-                                                const void* context,
-                                                const GURL& url,
-                                                const GURL& policy_url,
-                                                webkit::WebPluginInfo* plugin) {
+bool FakePluginServiceFilter::IsPluginEnabled(int render_process_id,
+                                              int render_view_id,
+                                              const void* context,
+                                              const GURL& url,
+                                              const GURL& policy_url,
+                                              webkit::WebPluginInfo* plugin) {
   std::map<FilePath, bool>::iterator it = plugin_state_.find(plugin->path);
   if (it == plugin_state_.end()) {
     ADD_FAILURE() << "No plug-in state for '" << plugin->path.value() << "'";
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
index 7079828..101fcf4 100644
--- a/content/browser/plugin_service_impl.cc
+++ b/content/browser/plugin_service_impl.cc
@@ -489,12 +489,12 @@ bool PluginServiceImpl::GetPluginInfo(int render_process_id,
     *is_stale = stale;
 
   for (size_t i = 0; i < plugins.size(); ++i) {
-    if (!filter_ || filter_->IsPluginAvailable(render_process_id,
-                                               render_view_id,
-                                               context,
-                                               url,
-                                               page_url,
-                                               &plugins[i])) {
+    if (!filter_ || filter_->IsPluginEnabled(render_process_id,
+                                             render_view_id,
+                                             context,
+                                             url,
+                                             page_url,
+                                             &plugins[i])) {
       *info = plugins[i];
       if (actual_mime_type)
         *actual_mime_type = mime_types[i];
diff --git a/content/browser/plugin_service_impl_browsertest.cc b/content/browser/plugin_service_impl_browsertest.cc
index 94b929a..0f25185 100644
--- a/content/browser/plugin_service_impl_browsertest.cc
+++ b/content/browser/plugin_service_impl_browsertest.cc
@@ -121,7 +121,7 @@ class MockPluginServiceFilter : public content::PluginServiceFilter {
  public:
   MockPluginServiceFilter() {}
 
-  virtual bool IsPluginAvailable(
+  virtual bool IsPluginEnabled(
       int render_process_id,
       int render_view_id,
       const void* context,
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 9bd597b..cd202d6 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -673,12 +673,12 @@ void RenderMessageFilter::GetPluginsCallback(
   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->IsPluginAvailable(child_process_id,
-                                             routing_id,
-                                             resource_context_,
-                                             GURL(),
-                                             GURL(),
-                                             &plugin)) {
+    if (!filter || filter->IsPluginEnabled(child_process_id,
+                                           routing_id,
+                                           resource_context_,
+                                           GURL(),
+                                           GURL(),
+                                           &plugin)) {
       plugins.push_back(plugin);
     }
   }
diff --git a/content/public/browser/plugin_service_filter.h b/content/public/browser/plugin_service_filter.h
index f0b8bbc..6b64818 100644
--- a/content/public/browser/plugin_service_filter.h
+++ b/content/public/browser/plugin_service_filter.h
@@ -20,16 +20,16 @@ class PluginServiceFilter {
  public:
   virtual ~PluginServiceFilter() {}
 
-  // Whether |plugin| is available. The client can return false to hide the
+  // Whether |plugin| is enabled. The client can return false to hide the
   // plugin, or return true and optionally change the passed in plugin.
-  virtual bool IsPluginAvailable(int render_process_id,
-                                 int render_view_id,
-                                 const void* context,
-                                 const GURL& url,
-                                 const GURL& policy_url,
-                                 webkit::WebPluginInfo* plugin) = 0;
-
-  // Whether the renderer has permission to load available |plugin|.
+  virtual bool IsPluginEnabled(int render_process_id,
+                               int render_view_id,
+                               const void* context,
+                               const GURL& url,
+                               const GURL& policy_url,
+                               webkit::WebPluginInfo* plugin) = 0;
+
+  // Whether the renderer has permission to load enabled |plugin|.
   virtual bool CanLoadPlugin(int render_process_id,
                              const FilePath& path) = 0;
 };