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

webkit/plugins/npapi/test/plugin_create_instance_in_paint.h

 // Copyright (c) 2009 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_GLUE_PLUGINS_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H
-#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H
+#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_
+#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_
 
-#include "webkit/glue/plugins/test/plugin_test.h"
+#include "webkit/plugins/npapi/test/plugin_test.h"
 
 namespace NPAPIClient {
 
 // This class tests that creating a new plugin via script while handling a
 // Windows message doesn't cause a deadlock.
 class CreateInstanceInPaintTest : public PluginTest {
  public:
   // Constructor.
   CreateInstanceInPaintTest(NPP id, NPNetscapeFuncs *host_functions);
   //
   // NPAPI functions
   //
   virtual NPError SetWindow(NPWindow* pNPWindow);
 
  private:
   static LRESULT CALLBACK WindowProc(
       HWND window, UINT message, WPARAM wparam, LPARAM lparam);
 
   HWND window_;
   bool created_;
 };
 
-} // namespace NPAPIClient
+}  // namespace NPAPIClient
 
-#endif  // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H
+#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_