| Index: webkit/plugins/npapi/plugin_group_unittest.cc
|
| ===================================================================
|
| --- webkit/plugins/npapi/plugin_group_unittest.cc (revision 0)
|
| +++ webkit/plugins/npapi/plugin_group_unittest.cc (working copy)
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/glue/plugins/plugin_group.h"
|
| +#include "webkit/plugins/npapi/plugin_group.h"
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -13,9 +13,12 @@
|
| #include "base/values.h"
|
| #include "base/version.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| -#include "webkit/glue/plugins/webplugininfo.h"
|
| -#include "webkit/glue/plugins/plugin_list.h"
|
| +#include "webkit/plugins/npapi/webplugininfo.h"
|
| +#include "webkit/plugins/npapi/plugin_list.h"
|
|
|
| +namespace webkit {
|
| +namespace npapi {
|
| +
|
| static const VersionRangeDefinition kPluginVersionRange[] = {
|
| { "", "", "3.0.44" }
|
| };
|
| @@ -159,10 +162,8 @@
|
|
|
| TEST(PluginGroupTest, PluginGroupDefinition) {
|
| const PluginGroupDefinition* definitions =
|
| - NPAPI::PluginList::GetPluginGroupDefinitions();
|
| - for (size_t i = 0;
|
| - i < NPAPI::PluginList::GetPluginGroupDefinitionsSize();
|
| - ++i) {
|
| + PluginList::GetPluginGroupDefinitions();
|
| + for (size_t i = 0; i < PluginList::GetPluginGroupDefinitionsSize(); ++i) {
|
| scoped_ptr<PluginGroup> def_group(
|
| PluginGroupTest::CreatePluginGroup(definitions[i]));
|
| ASSERT_TRUE(def_group.get() != NULL);
|
| @@ -222,3 +223,6 @@
|
| EXPECT_TRUE(PluginGroup::IsPluginNameDisabledByPolicy(
|
| ASCIIToUTF16("Google Earth")));
|
| }
|
| +
|
| +} // namespace npapi
|
| +} // namespace webkit
|
|
|