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

webkit/glue/plugins/coregraphics_private_symbols_mac.h

Index: webkit/glue/plugins/coregraphics_private_symbols_mac.h
diff --git a/webkit/plugins/npapi/coregraphics_private_symbols_mac.h b/webkit/glue/plugins/coregraphics_private_symbols_mac.h
similarity index 77%
rename from webkit/plugins/npapi/coregraphics_private_symbols_mac.h
rename to webkit/glue/plugins/coregraphics_private_symbols_mac.h
index b51153f7af6fea77f0c9c0213b674b5b2427ad2c..0342d6f0befe924b23c034242804ce73c5a91072 100644
--- a/webkit/plugins/npapi/coregraphics_private_symbols_mac.h
+++ b/webkit/glue/plugins/coregraphics_private_symbols_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_COREGRAPHICS_PRIVATE_SYMBOLS_MAC_H_
-#define WEBKIT_PLUGINS_NPAPI_COREGRAPHICS_PRIVATE_SYMBOLS_MAC_H_
+#ifndef WEBKIT_GLUE_PLUGINS_COREGRAPHICS_PRIVATE_SYMBOLS_MAC_H_
+#define WEBKIT_GLUE_PLUGINS_COREGRAPHICS_PRIVATE_SYMBOLS_MAC_H_
 
 // These are CoreGraphics SPI, verified to exist in both 10.5 and 10.6.
 
@@ -24,4 +24,4 @@ int _CGSDefaultConnection(void);
 }  // extern "C"
 #endif
 
-#endif  // WEBKIT_PLUGINS_NPAPI_COREGRAPHICS_PRIVATE_SYMBOLS_MAC_H_
+#endif  // WEBKIT_GLUE_PLUGINS_COREGRAPHICS_PRIVATE_SYMBOLS_MAC_H_