Merge Chromium at 10.0.621.0: Initial merge by git.

Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097

1 files changed, 18 insertions, 10 deletions

diff --git a/chrome/browser/plugin_updater.h b/chrome/browser/plugin_updater.h
index 2b8cd10..dc18595 100644
--- a/chrome/browser/plugin_updater.h
+++ b/chrome/browser/plugin_updater.h
@@ -6,19 +6,25 @@
 #define CHROME_BROWSER_PLUGIN_UPDATER_H_
 #pragma once
 
+#include <vector>
+
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/singleton.h"
 #include "chrome/common/notification_observer.h"
-#include "webkit/glue/plugins/plugin_list.h"
 
 class DictionaryValue;
 class ListValue;
 class NotificationDetails;
 class NotificationSource;
-class PluginGroup;
 class Profile;
+
+namespace webkit {
+namespace npapi {
+class PluginGroup;
 struct WebPluginInfo;
+}
+}
 
 class PluginUpdater : public NotificationObserver {
  public:
@@ -39,11 +45,11 @@ class PluginUpdater : public NotificationObserver {
   void UpdatePreferences(Profile* profile, int delay_ms);
 
   // NotificationObserver method overrides
-  void Observe(NotificationType type,
-               const NotificationSource& source,
-               const NotificationDetails& details);
+  virtual void Observe(NotificationType type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details);
 
-  static PluginUpdater* GetPluginUpdater();
+  static PluginUpdater* GetInstance();
 
  private:
   PluginUpdater();
@@ -54,9 +60,10 @@ class PluginUpdater : public NotificationObserver {
   static void GetPreferencesDataOnFileThread(void* profile);
 
   // Called on the UI thread with the plugin data to save the preferences.
-  static void OnUpdatePreferences(Profile* profile,
-                                  const std::vector<WebPluginInfo>& plugins,
-                                  const NPAPI::PluginList::PluginMap& groups);
+  static void OnUpdatePreferences(
+      Profile* profile,
+      const std::vector<webkit::npapi::WebPluginInfo>& plugins,
+      const std::vector<webkit::npapi::PluginGroup>& groups);
 
   // Queues sending the notification that plugin data has changed.  This is done
   // so that if a bunch of changes happen, we only send one notification.
@@ -65,7 +72,8 @@ class PluginUpdater : public NotificationObserver {
   // Used for the post task to notify that plugin enabled status changed.
   static void OnNotifyPluginStatusChanged();
 
-  static DictionaryValue* CreatePluginFileSummary(const WebPluginInfo& plugin);
+  static DictionaryValue* CreatePluginFileSummary(
+      const webkit::npapi::WebPluginInfo& plugin);
 
   // Force plugins to be disabled due to policy. |plugins| contains
   // the list of StringValues of the names of the policy-disabled plugins.