Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

chrome/browser/plugin_updater.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_PLUGIN_UPDATER_H_
 #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:
   // Get a list of all the plugin groups. The caller should take ownership
   // of the returned ListValue.
   static ListValue* GetPluginGroupsData();
 
   // Enable or disable a plugin group.
   void EnablePluginGroup(bool enable, const string16& group_name);
 
@@ skipping 17 matching lines @@
   PluginUpdater();
   virtual ~PluginUpdater() {}
 
   // Called on the file thread to get the data necessary to update the saved
   // preferences.  The profile pointer is only to be passed to the UI thread.
   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<webkit::npapi::WebPluginInfo>& plugins,
-      const std::vector<webkit::npapi::PluginGroup>& groups);
+      const std::vector<WebPluginInfo>& plugins,
+      const std::vector<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.
   void NotifyPluginStatusChanged();
 
   // Used for the post task to notify that plugin enabled status changed.
   static void OnNotifyPluginStatusChanged();
 
-  static DictionaryValue* CreatePluginFileSummary(
-      const webkit::npapi::WebPluginInfo& plugin);
+  static DictionaryValue* CreatePluginFileSummary(const WebPluginInfo& plugin);
 
   // Force plugins to be disabled due to policy. |plugins| contains
   // the list of StringValues of the names of the policy-disabled plugins.
   void DisablePluginsFromPolicy(const ListValue* plugin_names);
 
   // Needed to allow singleton instantiation using private constructor.
   friend struct DefaultSingletonTraits<PluginUpdater>;
 
   // Note: if you change this to false from true, you must update
   // kPluginsEnabledInternalPDF to be a new name (i.e. add 2, 3, 4...) at end.
   bool enable_internal_pdf_;
 
   bool notify_pending_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginUpdater);
 };
 
 #endif  // CHROME_BROWSER_PLUGIN_UPDATER_H_