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

webkit/glue/plugins/plugin_lib_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.
 
 #import <Carbon/Carbon.h>
 
-#include "webkit/plugins/npapi/plugin_lib.h"
+#include "webkit/glue/plugins/plugin_lib.h"
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/native_library.h"
 #include "base/scoped_ptr.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/glue/plugins/plugin_list.h"
+
+static const short kSTRTypeDefinitionResourceID = 128;
+static const short kSTRTypeDescriptionResourceID = 127;
+static const short kSTRPluginDescriptionResourceID = 126;
 
 using base::mac::ScopedCFTypeRef;
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 namespace {
 
-const short kSTRTypeDefinitionResourceID = 128;
-const short kSTRTypeDescriptionResourceID = 127;
-const short kSTRPluginDescriptionResourceID = 126;
-
 NSDictionary* GetMIMETypes(CFBundleRef bundle) {
   NSString* mime_filename =
       (NSString*)CFBundleGetValueForInfoDictionaryKey(bundle,
                      CFSTR("WebPluginMIMETypesFilename"));
 
   if (mime_filename) {
 
     // get the file
 
     NSString* mime_path =
@@ skipping 300 matching lines @@
     return true;
 
   if (ReadSTRPluginInfo(filename, bundle.get(), info))
     return true;
 
   // ... or not
 
   return false;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI