Merge 180159

chrome/browser/renderer_host/plugin_info_message_filter_unittest.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/at_exit.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/plugin_service_filter.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/plugins/npapi/mock_plugin_list.h"
 
 using content::PluginService;
 
 namespace {
 
 class FakePluginServiceFilter : public content::PluginServiceFilter {
  public:
   FakePluginServiceFilter() {}
   virtual ~FakePluginServiceFilter() {}
 
-  virtual bool ShouldUsePlugin(int render_process_id,
+  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;
+
   void set_plugin_enabled(const FilePath& plugin_path, bool enabled) {
     plugin_state_[plugin_path] = enabled;
   }
 
  private:
   std::map<FilePath, bool> plugin_state_;
 };
 
-bool FakePluginServiceFilter::ShouldUsePlugin(int render_process_id,
+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() << "'";
     return false;
   }
   return it->second;
 }
 
+bool FakePluginServiceFilter::CanLoadPlugin(int render_process_id,
+                                            const FilePath& path) {
+  return true;
+}
+
 }  // namespace
 
 class PluginInfoMessageFilterTest : public ::testing::Test {
  public:
   PluginInfoMessageFilterTest() :
       foo_plugin_path_(FILE_PATH_LITERAL("/path/to/foo")),
       bar_plugin_path_(FILE_PATH_LITERAL("/path/to/bar")),
       file_thread_(content::BrowserThread::FILE, &message_loop_) {
   }
 
@@ skipping 87 matching lines @@
     ChromeViewHostMsg_GetPluginInfo_Status status;
     webkit::WebPluginInfo plugin;
     std::string actual_mime_type;
     EXPECT_FALSE(context_.FindEnabledPlugin(
         0, GURL(), GURL(), "baz/blurp", &status, &plugin, &actual_mime_type,
         NULL));
     EXPECT_EQ(ChromeViewHostMsg_GetPluginInfo_Status::kNotFound, status.value);
     EXPECT_EQ(FILE_PATH_LITERAL(""), plugin.path.value());
   }
 }