Make WebPluginInfo more generic

webkit/plugins/webplugininfo.cc

Index: webkit/plugins/webplugininfo.cc
===================================================================
--- webkit/plugins/webplugininfo.cc	(revision 96217)
+++ webkit/plugins/webplugininfo.cc	(working copy)
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/npapi/webplugininfo.h"
+#include "webkit/plugins/webplugininfo.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 
 namespace webkit {
-namespace npapi {
 
 WebPluginMimeType::WebPluginMimeType() {}
 
@@ -24,7 +23,7 @@
 WebPluginMimeType::~WebPluginMimeType() {}
 
 WebPluginInfo::WebPluginInfo()
-    : enabled(USER_DISABLED_POLICY_UNMANAGED) {
+    : enabled(USER_DISABLED_POLICY_UNMANAGED), type(PLUGIN_TYPE_NPAPI) {
 }
 
 WebPluginInfo::WebPluginInfo(const WebPluginInfo& rhs)
@@ -33,7 +32,8 @@
       version(rhs.version),
       desc(rhs.desc),
       mime_types(rhs.mime_types),
-      enabled(rhs.enabled) {
+      enabled(rhs.enabled),
+      type(rhs.type) {
 }
 
 WebPluginInfo::~WebPluginInfo() {}
@@ -45,6 +45,7 @@
   desc = rhs.desc;
   mime_types = rhs.mime_types;
   enabled = rhs.enabled;
+  type = rhs.type;
   return *this;
 }
 
@@ -57,7 +58,8 @@
       version(fake_version),
       desc(fake_desc),
       mime_types(),
-      enabled(USER_ENABLED_POLICY_UNMANAGED) {
+      enabled(USER_ENABLED_POLICY_UNMANAGED),
+      type(PLUGIN_TYPE_NPAPI) {
 }
 
 bool IsPluginEnabled(const WebPluginInfo& plugin) {
@@ -65,5 +67,4 @@
           plugin.enabled == WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED);
 }
 
-}  // namespace npapi
 }  // namespace webkit