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

webkit/support/platform_support_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 "webkit/support/platform_support.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 #import <objc/objc-runtime.h>
 
 #include "base/base_paths.h"
 #include "base/data_pack.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "grit/webkit_resources.h"
 #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/glue/plugins/plugin_list.h"
 #import "webkit/support/drt_application_mac.h"
 #import "webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h"
 
 static base::DataPack* g_resource_data_pack = NULL;
 
 namespace webkit_support {
 
 static NSAutoreleasePool* autorelease_pool;
 
 void BeforeInitialize(bool unit_test_mode) {
@@ skipping 110 matching lines @@
     }
   }
 
   SwizzleNSPasteboard();
 
   // Add <app bundle's parent dir>/plugins to the plugin path so we can load
   // test plugins.
   FilePath plugins_dir;
   PathService::Get(base::DIR_EXE, &plugins_dir);
   plugins_dir = plugins_dir.AppendASCII("../../../plugins");
-  webkit::npapi::PluginList::Singleton()->AddExtraPluginDir(plugins_dir);
+  NPAPI::PluginList::Singleton()->AddExtraPluginDir(plugins_dir);
 }
 
 void BeforeShutdown() {
 }
 
 void AfterShutdown() {
   [DumpRenderTreePasteboard releaseLocalPasteboards];
   [autorelease_pool drain];
   delete g_resource_data_pack;
 }
@@ skipping 72 matching lines @@
     return res;
   }
 
   default:
     break;
   }
   return base::StringPiece();
 }
 
 }  // namespace webkit_glue