commit 91d9f3d52a1e55a9938416b258e08d3cc445eae4
author cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sun Aug 14 05:24:44 2011
committer cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sun Aug 14 05:24:44 2011
tree 41a281011d4ba9e327fb4e167528c99e0faec018
parent 3c8f946c38d15238f5b0793123c06859a8bc2352

Make WebPluginInfo more generic

- To account for pepper plugins, it grows a type field
- move WebPluginInfo from webkit::npapi to webkit:: and move the files as well.

This will allow us to remove hacks to get pepper plugins to load soon

BUG=89248
TEST=none
Review URL: http://codereview.chromium.org/7648017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96718 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/metrics/metrics_log.h

diff --git a/chrome/browser/metrics/metrics_log.h b/chrome/browser/metrics/metrics_log.h
index 36f2ec5d5..fbab92e 100644
--- a/chrome/browser/metrics/metrics_log.h
+++ b/chrome/browser/metrics/metrics_log.h
@@ -22,10 +22,8 @@
 }
 
 namespace webkit {
-namespace npapi {
 struct WebPluginInfo;
 }
-}
 
 class MetricsLog : public MetricsLogBase {
  public:
@@ -44,7 +42,7 @@
   // that are to be recorded. Each value in profile_metrics should be a
   // dictionary giving the metrics for the profile.
   void RecordEnvironment(
-      const std::vector<webkit::npapi::WebPluginInfo>& plugin_list,
+      const std::vector<webkit::WebPluginInfo>& plugin_list,
       const base::DictionaryValue* profile_metrics);
 
   // Records the input text, available choices, and selected entry when the
@@ -92,7 +90,7 @@
 
   // Writes the list of installed plugins.
   void WritePluginList(
-      const std::vector<webkit::npapi::WebPluginInfo>& plugin_list);
+      const std::vector<webkit::WebPluginInfo>& plugin_list);
 
   // Within the profile group, write basic install info including appversion.
   void WriteInstallElement();