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

webkit/plugins/npapi/test/plugin_javascript_open_popup.cc

-// 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.
 
 #include "build/build_config.h"
-#include "webkit/glue/plugins/test/plugin_javascript_open_popup.h"
+#include "webkit/plugins/npapi/test/plugin_javascript_open_popup.h"
 
 #if defined(USE_X11)
 #include "third_party/npapi/bindings/npapi_x11.h"
 #endif
-#include "webkit/glue/plugins/test/plugin_client.h"
+#include "webkit/plugins/npapi/test/plugin_client.h"
 
 namespace NPAPIClient {
 
 ExecuteJavascriptOpenPopupWithPluginTest::
     ExecuteJavascriptOpenPopupWithPluginTest(NPP id,
                                              NPNetscapeFuncs *host_functions)
     : PluginTest(id, host_functions),
       popup_window_test_started_(false) {
 }
 
@@ skipping 72 matching lines @@
 }
 #elif defined(OS_MACOSX)
 bool ExecuteJavascriptPopupWindowTargetPluginTest::CheckWindow(
     NPWindow* window) {
   // TODO(port) scaffolding--replace with a real test once NPWindow is done.
   return false;
 }
 #endif
 
 } // namespace NPAPIClient