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

chrome/default_plugin/plugin_impl_mac.mm

 // 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/default_plugin/plugin_impl_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/default_plugin/plugin_main.h"
 #include "googleurl/src/gurl.h"
 #include "grit/default_plugin_resources.h"
 #include "grit/webkit_strings.h"
 #include "unicode/locid.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/npapi/default_plugin_shared.h"
+#include "webkit/glue/plugins/default_plugin_shared.h"
 
 // TODO(thakis): Most methods in this class are stubbed out and need to be
 // implemented.
 
 PluginInstallerImpl::PluginInstallerImpl(int16 mode)
     : image_(nil),
       command_(nil) {
 }
 
 PluginInstallerImpl::~PluginInstallerImpl() {
@@ skipping 156 matching lines @@
 }
 
 
 void PluginInstallerImpl::ShowInstallDialog() {
 }
 
 void PluginInstallerImpl::NotifyPluginStatus(int status) {
   default_plugin::g_browser->getvalue(
       instance_,
       static_cast<NPNVariable>(
-          webkit::npapi::default_plugin::kMissingPluginStatusStart + status),
+          default_plugin::kMissingPluginStatusStart + status),
       NULL);
 }