From 49ba482a3a248c7cd4556b49ed601cda1e82aa9f Mon Sep 17 00:00:00 2001 From: "bauerb@chromium.org" Date: Wed, 15 Jun 2011 18:41:56 +0000 Subject: Content settings extension API: Implement ContentSetting.getResourceIdentifiers. BUG=71067 Review URL: http://codereview.chromium.org/7041005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89226 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/plugins/npapi/mock_plugin_list.cc | 33 +++++++++++++++++++++++ webkit/plugins/npapi/mock_plugin_list.h | 35 ++++++++++++++++++++++++ webkit/plugins/npapi/plugin_group.h | 6 ++--- webkit/plugins/npapi/plugin_list_unittest.cc | 40 ++-------------------------- 4 files changed, 72 insertions(+), 42 deletions(-) create mode 100644 webkit/plugins/npapi/mock_plugin_list.cc create mode 100644 webkit/plugins/npapi/mock_plugin_list.h (limited to 'webkit/plugins/npapi') diff --git a/webkit/plugins/npapi/mock_plugin_list.cc b/webkit/plugins/npapi/mock_plugin_list.cc new file mode 100644 index 0000000..5280052 --- /dev/null +++ b/webkit/plugins/npapi/mock_plugin_list.cc @@ -0,0 +1,33 @@ +// Copyright (c) 2011 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 "webkit/plugins/npapi/mock_plugin_list.h" + +namespace webkit { +namespace npapi { + +MockPluginList::MockPluginList(const PluginGroupDefinition* group_definitions, + size_t num_group_definitions) : + PluginList(group_definitions, num_group_definitions) { +} + +MockPluginList::~MockPluginList() { +} + +void MockPluginList::AddPluginToLoad(const WebPluginInfo& plugin) { + plugins_to_load_.push_back(plugin); +} + +void MockPluginList::ClearPluginsToLoad() { + plugins_to_load_.clear(); +} + +void MockPluginList::LoadPluginsInternal( + ScopedVector* plugin_groups) { + for (size_t i = 0; i < plugins_to_load_.size(); ++i) + AddToPluginGroups(plugins_to_load_[i], plugin_groups); +} + +} // npapi +} // webkit diff --git a/webkit/plugins/npapi/mock_plugin_list.h b/webkit/plugins/npapi/mock_plugin_list.h new file mode 100644 index 0000000..15c11c9 --- /dev/null +++ b/webkit/plugins/npapi/mock_plugin_list.h @@ -0,0 +1,35 @@ +// Copyright (c) 2011 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. + +#ifndef WEBKIT_PLUGINS_NPAPI_MOCK_PLUGIN_LIST_H_ +#define WEBKIT_PLUGINS_NPAPI_MOCK_PLUGIN_LIST_H_ + +#include "webkit/plugins/npapi/plugin_list.h" + +namespace webkit { +namespace npapi { + +// A PluginList for tests that avoids file system IO. There is also no reason +// to use |lock_| (but it doesn't hurt either). +class MockPluginList : public PluginList { + public: + MockPluginList(const PluginGroupDefinition* group_definitions, + size_t num_group_definitions); + virtual ~MockPluginList(); + + void AddPluginToLoad(const WebPluginInfo& plugin); + void ClearPluginsToLoad(); + + private: + std::vector plugins_to_load_; + + // PluginList methods: + virtual void LoadPluginsInternal( + ScopedVector* plugin_groups) OVERRIDE; +}; + +} // npapi +} // webkit + +#endif // WEBKIT_PLUGINS_NPAPI_MOCK_PLUGIN_LIST_H_ diff --git a/webkit/plugins/npapi/plugin_group.h b/webkit/plugins/npapi/plugin_group.h index deb8461..fd0f8e3 100644 --- a/webkit/plugins/npapi/plugin_group.h +++ b/webkit/plugins/npapi/plugin_group.h @@ -26,9 +26,7 @@ namespace webkit { namespace npapi { class PluginList; -namespace plugin_test_internal { -class PluginListWithoutFileIO; -} +class MockPluginList; // Hard-coded version ranges for plugin groups. struct VersionRangeDefinition { @@ -202,7 +200,7 @@ class PluginGroup { private: friend class PluginList; - friend class plugin_test_internal::PluginListWithoutFileIO; + friend class MockPluginList; friend class PluginGroupTest; friend class ::TableModelArrayControllerTest; friend class ::PluginExceptionsTableModelTest; diff --git a/webkit/plugins/npapi/plugin_list_unittest.cc b/webkit/plugins/npapi/plugin_list_unittest.cc index d037e38..785fc3c 100644 --- a/webkit/plugins/npapi/plugin_list_unittest.cc +++ b/webkit/plugins/npapi/plugin_list_unittest.cc @@ -6,47 +6,11 @@ #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webkit/plugins/npapi/mock_plugin_list.h" namespace webkit { namespace npapi { -namespace plugin_test_internal { - -// A PluginList for tests that avoids file system IO. There is also no reason -// to use |lock_| (but it doesn't hurt either). -class PluginListWithoutFileIO : public PluginList { - public: - PluginListWithoutFileIO(const PluginGroupDefinition* group_definitions, - size_t num_group_definitions) : - PluginList(group_definitions, num_group_definitions) {} - virtual ~PluginListWithoutFileIO() {} - - void AddPluginToLoad(const WebPluginInfo& plugin) { - plugins_to_load_.push_back(plugin); - } - - void ClearPluginsToLoad() { - plugins_to_load_.clear(); - } - - void AddPluginGroupDefinition(const PluginGroupDefinition& definition) { - hardcoded_definitions_.push_back(definition); - } - - private: - std::vector plugins_to_load_; - std::vector hardcoded_definitions_; - - // PluginList methods: - virtual void LoadPluginsInternal( - ScopedVector* plugin_groups) OVERRIDE { - for (size_t i = 0; i < plugins_to_load_.size(); ++i) - AddToPluginGroups(plugins_to_load_[i], plugin_groups); - } -}; - -} // namespace plugin_test_internal - namespace { bool Equals(const WebPluginInfo& a, const WebPluginInfo& b, @@ -103,7 +67,7 @@ class PluginListTest : public testing::Test { } protected: - plugin_test_internal::PluginListWithoutFileIO plugin_list_; + MockPluginList plugin_list_; WebPluginInfo foo_plugin_; WebPluginInfo bar_plugin_; }; -- cgit v1.1