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

webkit/plugins/npapi/test/plugin_npobject_proxy_test.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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 
 #if defined(OS_WIN)
 #define STRSAFE_NO_DEPRECATE
 #include <strsafe.h>
 #endif
-#include "webkit/glue/plugins/test/plugin_npobject_proxy_test.h"
+#include "webkit/plugins/npapi/test/plugin_npobject_proxy_test.h"
 
 namespace NPAPIClient {
 
 NPObjectProxyTest::NPObjectProxyTest(NPP id, NPNetscapeFuncs *host_functions)
   : PluginTest(id, host_functions) {
 }
 
 NPError NPObjectProxyTest::SetWindow(NPWindow* pNPWindow) {
   if (pNPWindow->window == NULL)
     return NPERR_NO_ERROR;
@@ skipping 19 matching lines @@
   NPVariant v;
   HostFunctions()->invoke(id(), doc, append_child_id, &textv, 1, &v);
 
   // If this test failed, then we'd have crashed by now.
   SignalTestCompleted();
 
   return NPERR_NO_ERROR;
 }
 
 } // namespace NPAPIClient