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

webkit/glue/plugins/plugin_lib_win.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 "webkit/plugins/npapi/plugin_lib.h"
+#include "webkit/glue/plugins/plugin_lib.h"
 
 #include "base/file_version_info.h"
 #include "base/file_version_info_win.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "webkit/plugins/npapi/plugin_constants_win.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/glue/plugins/plugin_constants_win.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 bool PluginLib::ReadWebPluginInfo(const FilePath &filename,
                                   WebPluginInfo* info) {
   // On windows, the way we get the mime types for the library is
   // to check the version information in the DLL itself.  This
   // will be a string of the format:  <type1>|<type2>|<type3>|...
   // For example:
   //     video/quicktime|audio/aiff|image/jpeg
   scoped_ptr<FileVersionInfo> version_info(
       FileVersionInfo::CreateFileVersionInfo(filename.value()));
@@ skipping 11 matching lines @@
   pvi.file_extensions = version_info_win->GetStringValue(L"FileExtents");
   pvi.type_descriptions = version_info_win->GetStringValue(L"FileOpenName");
   pvi.product_name = version_info->product_name();
   pvi.file_description = version_info->file_description();
   pvi.file_version = version_info->file_version();
   pvi.path = filename;
 
   return PluginList::CreateWebPluginInfo(pvi, info);
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI