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

chrome/browser/plugin_installer.cc

 // 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.
 
 #include "chrome/browser/plugin_installer.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #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[] =
     "http://www.google.com/support/chrome/bin/answer.py?answer=95697&topic=14687";
 
 PluginInstaller::PluginInstaller(TabContents* tab_contents)
     : ConfirmInfoBarDelegate(tab_contents),
       tab_contents_(tab_contents) {
 }
 
 PluginInstaller::~PluginInstaller() {
   // Remove any InfoBars we may be showing.
   tab_contents_->RemoveInfoBar(this);
 }
 
 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);
       break;
     }
     default: {
       NOTREACHED();
       break;
     }
   }
@@ skipping 26 matching lines @@
 string16 PluginInstaller::GetLinkText() {
   return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_PROBLEMSINSTALLING);
 }
 
 bool PluginInstaller::LinkClicked(WindowOpenDisposition disposition) {
   // Ignore the click dispostion and always open in a new top level tab.
   tab_contents_->OpenURL(GURL(kLearnMorePluginInstallerUrl), GURL(),
                          NEW_FOREGROUND_TAB, PageTransition::LINK);
   return false;  // Do not dismiss the info bar.
 }