Index: chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc |
=================================================================== |
--- chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc (revision 212185) |
+++ chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc (working copy) |
@@ -16,7 +16,6 @@ |
#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; |
@@ -83,7 +82,8 @@ |
webkit::WebPluginMimeType mimeType; |
mimeType.mime_type = "foo/bar"; |
foo_plugin.mime_types.push_back(mimeType); |
- plugin_list_.AddPluginToLoad(foo_plugin); |
+ PluginService::GetInstance()->Init(); |
+ PluginService::GetInstance()->RegisterInternalPlugin(foo_plugin, false); |
webkit::WebPluginInfo bar_plugin(ASCIIToUTF16("Bar Plug-in"), |
bar_plugin_path_, |
@@ -91,9 +91,8 @@ |
ASCIIToUTF16("The Bar plug-in.")); |
mimeType.mime_type = "foo/bar"; |
bar_plugin.mime_types.push_back(mimeType); |
- plugin_list_.AddPluginToLoad(bar_plugin); |
+ PluginService::GetInstance()->RegisterInternalPlugin(bar_plugin, false); |
- PluginService::GetInstance()->SetPluginListForTesting(&plugin_list_); |
PluginService::GetInstance()->SetFilter(&filter_); |
PluginService::GetInstance()->GetPlugins( |
@@ -119,7 +118,6 @@ |
// a MockPluginList. |
content::TestBrowserThread file_thread_; |
base::ShadowingAtExitManager at_exit_manager_; // Destroys the PluginService. |
- webkit::npapi::MockPluginList plugin_list_; |
}; |
TEST_F(PluginInfoMessageFilterTest, FindEnabledPlugin) { |