Make WebPluginInfo more generic

webkit/plugins/npapi/plugin_group_unittest.cc

 // 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/plugin_group.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/plugins/npapi/webplugininfo.h"
+#include "webkit/plugins/webplugininfo.h"
 
 namespace webkit {
 namespace npapi {
 
 static const VersionRangeDefinition kPluginVersionRange[] = {
     { "", "", "3.0.44", false }
 };
 static const VersionRangeDefinition kPlugin3VersionRange[] = {
     { "0", "4", "3.0.44", false }
 };
@@ skipping 116 matching lines @@
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
       EXPECT_TRUE(group->Match(plugin3045));
       group->AddPlugin(plugin3045);
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
     }
     {
       // Disable the second plugin.
       plugin3045.enabled =
-          webkit::npapi::WebPluginInfo::USER_DISABLED_POLICY_UNMANAGED;
+          webkit::WebPluginInfo::USER_DISABLED_POLICY_UNMANAGED;
       scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
           plugindefs[i]));
       EXPECT_TRUE(group->Match(plugin3043));
       group->AddPlugin(plugin3043);
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
       EXPECT_TRUE(group->Match(plugin3045));
       group->AddPlugin(plugin3045);
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
@@ skipping 242 matching lines @@
   EXPECT_EQ(kPlugin3043.desc, group->description());
   EXPECT_TRUE(group->IsVulnerable());
 
   EXPECT_TRUE(group->RemovePlugin(kPlugin3043.path));
   EXPECT_TRUE(group->IsEmpty());
   EXPECT_EQ(string16(), group->description());
 }
 
 }  // namespace npapi
 }  // namespace webkit