diff options
Diffstat (limited to 'chrome/browser/plugin_exceptions_table_model_unittest.cc')
-rw-r--r-- | chrome/browser/plugin_exceptions_table_model_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/plugin_exceptions_table_model_unittest.cc b/chrome/browser/plugin_exceptions_table_model_unittest.cc index e7efcca..b96f3fb 100644 --- a/chrome/browser/plugin_exceptions_table_model_unittest.cc +++ b/chrome/browser/plugin_exceptions_table_model_unittest.cc @@ -13,8 +13,8 @@ #include "chrome/test/testing_profile.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/plugins/npapi/plugin_group.h" -#include "webkit/plugins/npapi/webplugininfo.h" +#include "webkit/glue/plugins/plugin_group.h" +#include "webkit/glue/plugins/webplugininfo.h" // Can't be an internal namespace because PluginExceptionsTableModel declares // as a friend. @@ -85,21 +85,21 @@ class PluginExceptionsTableModelTest : public testing::Test { table_model_.reset(new MockPluginExceptionsTableModel(map, NULL)); - std::vector<webkit::npapi::PluginGroup> plugins; - webkit::npapi::WebPluginInfo foo_plugin; + std::vector<PluginGroup> plugins; + WebPluginInfo foo_plugin; foo_plugin.path = FilePath(FILE_PATH_LITERAL("a-foo")); foo_plugin.name = ASCIIToUTF16("FooPlugin"); foo_plugin.enabled = true; - scoped_ptr<webkit::npapi::PluginGroup> foo_group( - webkit::npapi::PluginGroup::FromWebPluginInfo(foo_plugin)); + scoped_ptr<PluginGroup> foo_group( + PluginGroup::FromWebPluginInfo(foo_plugin)); plugins.push_back(*foo_group); - webkit::npapi::WebPluginInfo bar_plugin; + WebPluginInfo bar_plugin; bar_plugin.path = FilePath(FILE_PATH_LITERAL("b-bar")); bar_plugin.name = ASCIIToUTF16("BarPlugin"); bar_plugin.enabled = true; - scoped_ptr<webkit::npapi::PluginGroup> bar_group( - webkit::npapi::PluginGroup::FromWebPluginInfo(bar_plugin)); + scoped_ptr<PluginGroup> bar_group( + PluginGroup::FromWebPluginInfo(bar_plugin)); plugins.push_back(*bar_group); table_model_->set_plugins(plugins); |