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

webkit/glue/plugins/test/plugin_client.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CLIENT_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CLIENT_H_
+#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__
+#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__
 
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/nphostapi.h"
 
 namespace NPAPIClient {
 
 // A PluginClient is a NPAPI Plugin.  This class contains
 // the bootstrapping functions used by the browser to load
 // the plugin.
 class PluginClient {
@@ skipping 16 matching lines @@
   // by all instances of a plug-in.
   static NPError Shutdown();
 
   // The table of functions provided by the host.
   static NPNetscapeFuncs *HostFunctions() { return host_functions_; }
 
  private:
   static NPNetscapeFuncs* host_functions_;
 };
 
-}  // namespace NPAPIClient
+} // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CLIENT_H_
+#endif  // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__