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

Manually reverting r69755, which broke the tree.

BUG=none
TEST=none
TBR=dmaclach@chromium.org

Review URL: http://codereview.chromium.org/5998002

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

chrome/app/framework.order

@@ -30,13 +30,13 @@ __ZN22mac_plugin_interposing31NotifyBrowserOfPluginHideWindowEj6CGRect
 __ZN22mac_plugin_interposing28NotifyPluginOfSetThemeCursorEPvm
 __ZN22mac_plugin_interposing23NotifyPluginOfSetCursorEPvPK6Cursor
 __ZN22mac_plugin_interposing23GetPluginWindowHasFocusEPv
-__ZN6webkit5npapi25CarbonPluginWindowTrackerC1Ev
-__ZN6webkit5npapi25CarbonPluginWindowTrackerC2Ev
-__ZN6webkit5npapi25CarbonPluginWindowTracker14SharedInstanceEv
-__ZN6webkit5npapi25CarbonPluginWindowTracker28CreateDummyWindowForDelegateEPv
-__ZNK6webkit5npapi25CarbonPluginWindowTracker25GetDelegateForDummyWindowEP15OpaqueWindowPtr
-__ZNK6webkit5npapi25CarbonPluginWindowTracker25GetDummyWindowForDelegateEPv
-__ZN6webkit5npapi25CarbonPluginWindowTracker29DestroyDummyWindowForDelegateEPvP15OpaqueWindowPtr
+__ZN25CarbonPluginWindowTrackerC1Ev
+__ZN25CarbonPluginWindowTrackerC2Ev
+__ZN25CarbonPluginWindowTracker14SharedInstanceEv
+__ZN25CarbonPluginWindowTracker28CreateDummyWindowForDelegateEPv
+__ZNK25CarbonPluginWindowTracker25GetDelegateForDummyWindowEP15OpaqueWindowPtr
+__ZNK25CarbonPluginWindowTracker25GetDummyWindowForDelegateEPv
+__ZN25CarbonPluginWindowTracker29DestroyDummyWindowForDelegateEPvP15OpaqueWindowPtr
 __ZN7WebCore22narrowPrecisionToFloatIdEEfT_
 __ZN7WebCore24narrowPrecisionToCGFloatIdEEfT_
 __ZnwmPv

chrome/browser/automation/automation_provider.cc

@@ -102,6 +102,7 @@
 #include "chrome/browser/automation/ui_controls.h"
 #include "views/event.h"
 #include "webkit/glue/password_form.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/external_tab_container_win.h"

chrome/browser/automation/testing_automation_provider.cc

@@ -75,7 +75,7 @@
 #include "net/base/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 #include "views/event.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
 namespace {
 
@@ -2993,11 +2993,10 @@ void TestingAutomationProvider::GetPluginsInfo(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
-  std::vector<webkit::npapi::WebPluginInfo> plugins;
-  webkit::npapi::PluginList::Singleton()->GetPlugins(false, &plugins);
+  std::vector<WebPluginInfo> plugins;
+  NPAPI::PluginList::Singleton()->GetPlugins(false, &plugins);
   ListValue* items = new ListValue;
-  for (std::vector<webkit::npapi::WebPluginInfo>::const_iterator it =
-           plugins.begin();
+  for (std::vector<WebPluginInfo>::const_iterator it = plugins.begin();
        it != plugins.end();
        ++it) {
     DictionaryValue* item = new DictionaryValue;
@@ -3008,7 +3007,7 @@ void TestingAutomationProvider::GetPluginsInfo(
     item->SetBoolean("enabled", it->enabled);
     // Add info about mime types.
     ListValue* mime_types = new ListValue();
-    for (std::vector<webkit::npapi::WebPluginMimeType>::const_iterator type_it =
+    for (std::vector<WebPluginMimeType>::const_iterator type_it =
              it->mime_types.begin();
          type_it != it->mime_types.end();
          ++type_it) {
@@ -3047,8 +3046,7 @@ void TestingAutomationProvider::EnablePlugin(Browser* browser,
   if (!args->GetString("path", &path)) {
     reply.SendError("path not specified.");
     return;
-  } else if (!webkit::npapi::PluginList::Singleton()->EnablePlugin(
-        FilePath(path))) {
+  } else if (!NPAPI::PluginList::Singleton()->EnablePlugin(FilePath(path))) {
     reply.SendError(StringPrintf("Could not enable plugin for path %s.",
                                  path.c_str()));
     return;
@@ -3067,8 +3065,7 @@ void TestingAutomationProvider::DisablePlugin(Browser* browser,
   if (!args->GetString("path", &path)) {
     reply.SendError("path not specified.");
     return;
-  } else if (!webkit::npapi::PluginList::Singleton()->DisablePlugin(
-        FilePath(path))) {
+  } else if (!NPAPI::PluginList::Singleton()->DisablePlugin(FilePath(path))) {
     reply.SendError(StringPrintf("Could not disable plugin for path %s.",
                                  path.c_str()));
     return;

chrome/browser/dom_ui/plugins_ui.cc

@@ -32,7 +32,7 @@
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
 namespace {
 
@@ -223,8 +223,7 @@ void PluginsDOMHandler::HandleEnablePluginMessage(const ListValue* args) {
     plugin_updater->EnablePluginGroup(enable, group_name);
     if (enable) {
       // See http://crbug.com/50105 for background.
-      string16 adobereader = ASCIIToUTF16(
-          webkit::npapi::PluginGroup::kAdobeReaderGroupName);
+      string16 adobereader = ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName);
       string16 internalpdf = ASCIIToUTF16(PepperPluginRegistry::kPDFPluginName);
       if (group_name == adobereader) {
         plugin_updater->EnablePluginGroup(false, internalpdf);

chrome/browser/gtk/content_setting_bubble_gtk.cc

@@ -27,7 +27,7 @@
 #include "gfx/gtk_util.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
 namespace {
 
@@ -109,7 +109,7 @@ void ContentSettingBubbleGtk::BuildBubble() {
     for (std::set<std::string>::const_iterator it = plugins.begin();
         it != plugins.end(); ++it) {
       std::string name = UTF16ToUTF8(
-          webkit::npapi::PluginList::Singleton()->GetPluginGroupName(*it));
+          NPAPI::PluginList::Singleton()->GetPluginGroupName(*it));
       if (name.empty())
         name = *it;
 

chrome/browser/hang_monitor/hung_plugin_action.cc

@@ -12,7 +12,7 @@
 #include "chrome/browser/platform_util.h"
 #include "chrome/common/logging_chrome.h"
 #include "grit/generated_resources.h"
-#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
+#include "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 HungPluginAction::HungPluginAction() : current_hung_plugin_window_(NULL) {
 }
@@ -122,8 +122,8 @@ bool HungPluginAction::GetPluginName(HWND plugin_window,
       // we have gone too far.
       return false;
     }
-    if (webkit::npapi::WebPluginDelegateImpl::GetPluginNameFromWindow(
-            window_to_check, plugin_name)) {
+    if (WebPluginDelegateImpl::GetPluginNameFromWindow(window_to_check,
+                                                       plugin_name)) {
       return true;
     }
     window_to_check = GetParent(window_to_check);

chrome/browser/metrics/metrics_log.cc

@@ -25,7 +25,6 @@
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/plugins/npapi/webplugininfo.h"
 
 #define OPEN_ELEMENT_FOR_SCOPE(name) ScopedElement scoped_element(this, name)
 
@@ -238,13 +237,12 @@ void MetricsLog::WriteRealtimeStabilityAttributes(PrefService* pref) {
 }
 
 void MetricsLog::WritePluginList(
-    const std::vector<webkit::npapi::WebPluginInfo>& plugin_list) {
+         const std::vector<WebPluginInfo>& plugin_list) {
   DCHECK(!locked_);
 
   OPEN_ELEMENT_FOR_SCOPE("plugins");
 
-  for (std::vector<webkit::npapi::WebPluginInfo>::const_iterator iter =
-           plugin_list.begin();
+  for (std::vector<WebPluginInfo>::const_iterator iter = plugin_list.begin();
        iter != plugin_list.end(); ++iter) {
     OPEN_ELEMENT_FOR_SCOPE("plugin");
 
@@ -264,7 +262,7 @@ void MetricsLog::WriteInstallElement() {
 }
 
 void MetricsLog::RecordEnvironment(
-         const std::vector<webkit::npapi::WebPluginInfo>& plugin_list,
+         const std::vector<WebPluginInfo>& plugin_list,
          const DictionaryValue* profile_metrics) {
   DCHECK(!locked_);
 

chrome/browser/metrics/metrics_log.h

@@ -12,18 +12,13 @@
 #include "base/basictypes.h"
 #include "chrome/common/metrics_helpers.h"
 #include "chrome/common/page_transition_types.h"
+#include "webkit/glue/plugins/webplugininfo.h"
 
 struct AutocompleteLog;
 class DictionaryValue;
 class GURL;
 class PrefService;
 
-namespace webkit {
-namespace npapi {
-struct WebPluginInfo;
-}
-}
-
 class MetricsLog : public MetricsLogBase {
  public:
   // Creates a new metrics log
@@ -40,9 +35,8 @@ class MetricsLog : public MetricsLogBase {
   // profile_metrics, if non-null, gives a dictionary of all profile metrics
   // 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 DictionaryValue* profile_metrics);
+  void RecordEnvironment(const std::vector<WebPluginInfo>& plugin_list,
+                         const DictionaryValue* profile_metrics);
 
   // Records the input text, available choices, and selected entry when the
   // user uses the Omnibox to open a URL.
@@ -86,8 +80,7 @@ class MetricsLog : public MetricsLogBase {
   void WriteRealtimeStabilityAttributes(PrefService* pref);
 
   // Writes the list of installed plugins.
-  void WritePluginList(
-      const std::vector<webkit::npapi::WebPluginInfo>& plugin_list);
+  void WritePluginList(const std::vector<WebPluginInfo>& plugin_list);
 
   // Within the profile group, write basic install info including appversion.
   void WriteInstallElement();

chrome/browser/metrics/metrics_service.cc

@@ -184,8 +184,8 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
-#include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/plugins/npapi/webplugininfo.h"
+#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/glue/plugins/webplugininfo.h"
 #include "libxml/xmlwriter.h"
 
 // TODO(port): port browser_distribution.h.
@@ -336,9 +336,8 @@ class MetricsMemoryDetails : public MemoryDetails {
 
 class MetricsService::InitTaskComplete : public Task {
  public:
-  explicit InitTaskComplete(
-      const std::string& hardware_class,
-      const std::vector<webkit::npapi::WebPluginInfo>& plugins)
+  explicit InitTaskComplete(const std::string& hardware_class,
+                            const std::vector<WebPluginInfo>& plugins)
       : hardware_class_(hardware_class), plugins_(plugins) {}
 
   virtual void Run() {
@@ -348,7 +347,7 @@ class MetricsService::InitTaskComplete : public Task {
 
  private:
   std::string hardware_class_;
-  std::vector<webkit::npapi::WebPluginInfo> plugins_;
+  std::vector<WebPluginInfo> plugins_;
 };
 
 class MetricsService::InitTask : public Task {
@@ -357,12 +356,12 @@ class MetricsService::InitTask : public Task {
       : callback_loop_(callback_loop) {}
 
   virtual void Run() {
-    std::vector<webkit::npapi::WebPluginInfo> plugins;
-    webkit::npapi::PluginList::Singleton()->GetPlugins(false, &plugins);
+    std::vector<WebPluginInfo> plugins;
+    NPAPI::PluginList::Singleton()->GetPlugins(false, &plugins);
     std::string hardware_class;  // Empty string by default.
 #if defined(OS_CHROMEOS)
     chromeos::SystemLibrary* system_library =
-        chromeos::CrosLibrary::Get()->GetSystemLibrary();
+      chromeos::CrosLibrary::Get()->GetSystemLibrary();
     system_library->GetMachineStatistic("hardware_class", &hardware_class);
 #endif  // OS_CHROMEOS
     callback_loop_->PostTask(FROM_HERE, new InitTaskComplete(
@@ -802,7 +801,7 @@ void MetricsService::InitializeMetricsState() {
 
 void MetricsService::OnInitTaskComplete(
     const std::string& hardware_class,
-    const std::vector<webkit::npapi::WebPluginInfo>& plugins) {
+    const std::vector<WebPluginInfo>& plugins) {
   DCHECK(state_ == INIT_TASK_SCHEDULED);
   hardware_class_ = hardware_class;
   plugins_ = plugins;

chrome/browser/metrics/metrics_service.h

@@ -33,12 +33,7 @@ class HistogramSynchronizer;
 class MetricsLogBase;
 class PrefService;
 class TemplateURLModel;
-
-namespace webkit {
-namespace npapi {
 struct WebPluginInfo;
-}
-}
 
 // Forward declaration of the xmlNode to avoid having tons of gyp files
 // needing to depend on the libxml third party lib.
@@ -160,7 +155,7 @@ class MetricsService : public NotificationObserver,
   // Callback to let us know that the init task is done.
   void OnInitTaskComplete(
       const std::string& hardware_class,
-      const std::vector<webkit::npapi::WebPluginInfo>& plugins);
+      const std::vector<WebPluginInfo>& plugins);
 
   // When we start a new version of Chromium (different from our last run), we
   // need to discard the old crash stats so that we don't attribute crashes etc.
@@ -423,7 +418,7 @@ class MetricsService : public NotificationObserver,
   std::string hardware_class_;
 
   // The list of plugins which was retrieved on the file thread.
-  std::vector<webkit::npapi::WebPluginInfo> plugins_;
+  std::vector<WebPluginInfo> plugins_;
 
   // The outstanding transmission appears as a URL Fetch operation.
   scoped_ptr<URLFetcher> current_fetch_;

chrome/browser/mock_plugin_exceptions_table_model.cc

@@ -5,11 +5,11 @@
 #include "chrome/browser/mock_plugin_exceptions_table_model.h"
 
 void MockPluginExceptionsTableModel::set_plugins(
-    std::vector<webkit::npapi::PluginGroup>& plugins) {
+    std::vector<PluginGroup>& plugins) {
   plugins_ = plugins;
 }
 
 void MockPluginExceptionsTableModel::GetPlugins(
-    std::vector<webkit::npapi::PluginGroup>* plugin_groups) {
+    std::vector<PluginGroup>* plugin_groups) {
   *plugin_groups = plugins_;
 }

chrome/browser/mock_plugin_exceptions_table_model.h

@@ -17,14 +17,13 @@ class MockPluginExceptionsTableModel : public PluginExceptionsTableModel {
       : PluginExceptionsTableModel(map, otr_map) {}
   virtual ~MockPluginExceptionsTableModel() {}
 
-  void set_plugins(std::vector<webkit::npapi::PluginGroup>& plugins);
+  void set_plugins(std::vector<PluginGroup>& plugins);
 
  protected:
-  virtual void GetPlugins(
-      std::vector<webkit::npapi::PluginGroup>* plugin_groups);
+  virtual void GetPlugins(std::vector<PluginGroup>* plugin_groups);
 
  private:
-  std::vector<webkit::npapi::PluginGroup> plugins_;
+  std::vector<PluginGroup> plugins_;
 };
 
 #endif  // CHROME_BROWSER_MOCK_PLUGIN_EXCEPTIONS_TABLE_MODEL_H_

chrome/browser/plugin_carbon_interpose_mac.cc

@@ -8,7 +8,7 @@
 
 #include "chrome/plugin/plugin_interpose_util_mac.h"
 #include "gfx/rect.h"
-#include "webkit/plugins/npapi/carbon_plugin_window_tracker_mac.h"
+#include "webkit/glue/plugins/carbon_plugin_window_tracker_mac.h"
 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
@@ -61,16 +61,16 @@ static void OnPluginWindowSelected(WindowRef window) {
 
 static Boolean ChromePluginIsWindowActive(WindowRef window) {
   const OpaquePluginRef delegate =
-      webkit::npapi::CarbonPluginWindowTracker::SharedInstance()->
-          GetDelegateForDummyWindow(window);
+      CarbonPluginWindowTracker::SharedInstance()->GetDelegateForDummyWindow(
+          window);
   return delegate ? IsContainingWindowActive(delegate)
                   : IsWindowActive(window);
 }
 
 static Boolean ChromePluginIsWindowHilited(WindowRef window) {
   const OpaquePluginRef delegate =
-      webkit::npapi::CarbonPluginWindowTracker::SharedInstance()->
-          GetDelegateForDummyWindow(window);
+      CarbonPluginWindowTracker::SharedInstance()->GetDelegateForDummyWindow(
+          window);
   return delegate ? IsContainingWindowActive(delegate)
                   : IsWindowHilited(window);
 }
@@ -126,8 +126,8 @@ static void ChromePluginDisposeDialog(DialogRef dialog) {
 
 static WindowPartCode ChromePluginFindWindow(Point point, WindowRef* window) {
   OpaquePluginRef delegate = mac_plugin_interposing::GetActiveDelegate();
-  webkit::npapi::CarbonPluginWindowTracker* tracker =
-      webkit::npapi::CarbonPluginWindowTracker::SharedInstance();
+  CarbonPluginWindowTracker* tracker =
+      CarbonPluginWindowTracker::SharedInstance();
   WindowRef plugin_window = tracker->GetDummyWindowForDelegate(delegate);
   if (plugin_window) {
     // If plugin_window is non-NULL, then we are in the middle of routing an

chrome/browser/plugin_data_remover.cc

@@ -10,8 +10,8 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/common/plugin_messages.h"
-#include "webkit/plugins/npapi/plugin_group.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/glue/plugins/plugin_group.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
@@ -65,8 +65,7 @@ bool PluginDataRemover::OffTheRecord() {
   return false;
 }
 
-void PluginDataRemover::SetPluginInfo(
-    const webkit::npapi::WebPluginInfo& info) {
+void PluginDataRemover::SetPluginInfo(const WebPluginInfo& info) {
 }
 
 void PluginDataRemover::OnChannelOpened(const IPC::ChannelHandle& handle) {
@@ -143,16 +142,16 @@ void PluginDataRemover::SignalDone() {
 bool PluginDataRemover::IsSupported() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   bool allow_wildcard = false;
-  webkit::npapi::WebPluginInfo plugin;
+  WebPluginInfo plugin;
   std::string mime_type;
-  if (!webkit::npapi::PluginList::Singleton()->GetPluginInfo(GURL(),
-                                                             g_flash_mime_type,
-                                                             allow_wildcard,
-                                                             &plugin,
-                                                             &mime_type))
+  if (!NPAPI::PluginList::Singleton()->GetPluginInfo(GURL(),
+                                                     g_flash_mime_type,
+                                                     allow_wildcard,
+                                                     &plugin,
+                                                     &mime_type))
     return false;
   scoped_ptr<Version> version(
-      webkit::npapi::PluginGroup::CreateVersionFromString(plugin.version));
+      PluginGroup::CreateVersionFromString(plugin.version));
   scoped_ptr<Version> min_version(
       Version::GetVersionFromString(g_min_flash_version));
   return plugin.enabled &&

chrome/browser/plugin_data_remover.h

@@ -41,7 +41,7 @@ class PluginDataRemover : public base::RefCountedThreadSafe<PluginDataRemover>,
   // PluginProcessHost::Client methods
   virtual int ID();
   virtual bool OffTheRecord();
-  virtual void SetPluginInfo(const webkit::npapi::WebPluginInfo& info);
+  virtual void SetPluginInfo(const WebPluginInfo& info);
   virtual void OnChannelOpened(const IPC::ChannelHandle& handle);
   virtual void OnError();
 

chrome/browser/plugin_exceptions_table_model.cc

@@ -134,13 +134,13 @@ void PluginExceptionsTableModel::ClearSettings() {
 }
 
 void PluginExceptionsTableModel::GetPlugins(
-    std::vector<webkit::npapi::PluginGroup>* plugin_groups) {
-  webkit::npapi::PluginList::Singleton()->GetPluginGroups(false, plugin_groups);
+    std::vector<PluginGroup>* plugin_groups) {
+  NPAPI::PluginList::Singleton()->GetPluginGroups(false, plugin_groups);
 }
 
 void PluginExceptionsTableModel::LoadSettings() {
   int group_id = 0;
-  std::vector<webkit::npapi::PluginGroup> plugins;
+  std::vector<PluginGroup> plugins;
   GetPlugins(&plugins);
   for (size_t i = 0; i < plugins.size(); ++i) {
     std::string plugin = plugins[i].identifier();

chrome/browser/plugin_exceptions_table_model.h

@@ -13,7 +13,7 @@
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/remove_rows_table_model.h"
 #include "chrome/common/notification_observer.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
 struct WebPluginInfo;
 
@@ -48,8 +48,7 @@ class PluginExceptionsTableModel : public RemoveRowsTableModel,
 
  protected:
   // Subclasses can override this method for testing.
-  virtual void GetPlugins(
-      std::vector<webkit::npapi::PluginGroup>* plugin_groups);
+  virtual void GetPlugins(std::vector<PluginGroup>* plugin_groups);
 
  private:
   friend class PluginExceptionsTableModelTest;

chrome/browser/plugin_exceptions_table_model_unittest.cc

@@ -13,8 +13,8 @@
 #include "chrome/test/testing_profile.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/plugins/npapi/plugin_group.h"
-#include "webkit/plugins/npapi/webplugininfo.h"
+#include "webkit/glue/plugins/plugin_group.h"
+#include "webkit/glue/plugins/webplugininfo.h"
 
 // Can't be an internal namespace because PluginExceptionsTableModel declares
 // as a friend.
@@ -85,21 +85,21 @@ class PluginExceptionsTableModelTest : public testing::Test {
 
     table_model_.reset(new MockPluginExceptionsTableModel(map, NULL));
 
-    std::vector<webkit::npapi::PluginGroup> plugins;
-    webkit::npapi::WebPluginInfo foo_plugin;
+    std::vector<PluginGroup> plugins;
+    WebPluginInfo foo_plugin;
     foo_plugin.path = FilePath(FILE_PATH_LITERAL("a-foo"));
     foo_plugin.name = ASCIIToUTF16("FooPlugin");
     foo_plugin.enabled = true;
-    scoped_ptr<webkit::npapi::PluginGroup> foo_group(
-        webkit::npapi::PluginGroup::FromWebPluginInfo(foo_plugin));
+    scoped_ptr<PluginGroup> foo_group(
+        PluginGroup::FromWebPluginInfo(foo_plugin));
     plugins.push_back(*foo_group);
 
-    webkit::npapi::WebPluginInfo bar_plugin;
+    WebPluginInfo bar_plugin;
     bar_plugin.path = FilePath(FILE_PATH_LITERAL("b-bar"));
     bar_plugin.name = ASCIIToUTF16("BarPlugin");
     bar_plugin.enabled = true;
-    scoped_ptr<webkit::npapi::PluginGroup> bar_group(
-        webkit::npapi::PluginGroup::FromWebPluginInfo(bar_plugin));
+    scoped_ptr<PluginGroup> bar_group(
+        PluginGroup::FromWebPluginInfo(bar_plugin));
     plugins.push_back(*bar_group);
 
     table_model_->set_plugins(plugins);

chrome/browser/plugin_installer.cc

@@ -12,7 +12,7 @@
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
-#include "webkit/plugins/npapi/default_plugin_shared.h"
+#include "webkit/glue/plugins/default_plugin_shared.h"
 
 // The URL for the "Problems installing" page for the Plugins infobar.
 static const char kLearnMorePluginInstallerUrl[] =
@@ -30,11 +30,11 @@ PluginInstaller::~PluginInstaller() {
 
 void PluginInstaller::OnMissingPluginStatus(int status) {
   switch (status) {
-    case webkit::npapi::default_plugin::MISSING_PLUGIN_AVAILABLE: {
+    case default_plugin::MISSING_PLUGIN_AVAILABLE: {
       tab_contents_->AddInfoBar(this);
       break;
     }
-    case webkit::npapi::default_plugin::MISSING_PLUGIN_USER_STARTED_DOWNLOAD: {
+    case default_plugin::MISSING_PLUGIN_USER_STARTED_DOWNLOAD: {
       // Hide the InfoBar if user already started download/install of the
       // missing plugin.
       tab_contents_->RemoveInfoBar(this);

chrome/browser/plugin_process_host.cc

@@ -169,7 +169,7 @@ PluginProcessHost::~PluginProcessHost() {
   CancelRequests();
 }
 
-bool PluginProcessHost::Init(const webkit::npapi::WebPluginInfo& info,
+bool PluginProcessHost::Init(const WebPluginInfo& info,
                              const std::string& locale) {
   info_ = info;
   set_name(UTF16ToWideHack(info_.name));