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

webkit/plugins/npapi/test/plugin_javascript_open_popup.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H
-#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H
+#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_
+#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_
 
-#include "webkit/glue/plugins/test/plugin_test.h"
+#include "webkit/plugins/npapi/test/plugin_test.h"
 
 namespace NPAPIClient {
 
 // This class tests the case where a windowed plugin instance is
 // instantiated in a popup window. The plugin instance needs to
 // have a valid parent window.
 class ExecuteJavascriptOpenPopupWithPluginTest : public PluginTest {
  public:
   // Constructor.
   ExecuteJavascriptOpenPopupWithPluginTest(
@@ skipping 16 matching lines @@
 
  private:
   // Do a platform-specific validation of the passed-in |window|.
   // E.g. on Windows, verifies window->window is a reasonable HWND.
   // Returns true if the test should be marked complete.
   bool CheckWindow(NPWindow* window);
 
   bool test_completed_;
 };
 
-} // namespace NPAPIClient
+}  // namespace NPAPIClient
 
-#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H
+#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_