| Index: webkit/plugins/npapi/plugin_list_unittest.cc
|
| ===================================================================
|
| --- webkit/plugins/npapi/plugin_list_unittest.cc (revision 212185)
|
| +++ webkit/plugins/npapi/plugin_list_unittest.cc (working copy)
|
| @@ -7,7 +7,6 @@
|
| #include "base/strings/string16.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| -#include "webkit/plugins/npapi/mock_plugin_list.h"
|
|
|
| namespace webkit {
|
| namespace npapi {
|
| @@ -51,12 +50,13 @@
|
| }
|
|
|
| virtual void SetUp() {
|
| - plugin_list_.AddPluginToLoad(bar_plugin_);
|
| - plugin_list_.AddPluginToLoad(foo_plugin_);
|
| + plugin_list_.DisablePluginsDiscovery();
|
| + plugin_list_.RegisterInternalPlugin(bar_plugin_, false);
|
| + plugin_list_.RegisterInternalPlugin(foo_plugin_, false);
|
| }
|
|
|
| protected:
|
| - MockPluginList plugin_list_;
|
| + PluginList plugin_list_;
|
| WebPluginInfo foo_plugin_;
|
| WebPluginInfo bar_plugin_;
|
| };
|
| @@ -74,8 +74,7 @@
|
| base::string16(), base::FilePath(FILE_PATH_LITERAL("/myplugin.3.0.43")),
|
| base::string16(), base::string16());
|
| // Simulate loading of the plugins.
|
| - plugin_list_.ClearPluginsToLoad();
|
| - plugin_list_.AddPluginToLoad(plugin_3043);
|
| + plugin_list_.RegisterInternalPlugin(plugin_3043, false);
|
| // Now we should have them in the state we specified above.
|
| plugin_list_.RefreshPlugins();
|
| std::vector<WebPluginInfo> plugins;
|
|
|