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

webkit/glue/plugins/test/plugin_windowed_test.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "webkit/plugins/npapi/test/plugin_windowed_test.h"
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "webkit/glue/plugins/test/plugin_windowed_test.h"
+#include "webkit/glue/plugins/test/plugin_client.h"
 
 namespace NPAPIClient {
 
 WindowedPluginTest::WindowedPluginTest(NPP id, NPNetscapeFuncs *host_functions)
     : PluginTest(id, host_functions),
       window_(NULL), done_(false) {
 }
 
 WindowedPluginTest::~WindowedPluginTest() {
   if (window_)
@@ skipping 124 matching lines @@
 
     if (this_ptr->done_) {
       ::RemoveProp(window, L"Plugin_Instance");
     }
   }
 
   return DefWindowProc(window, message, wparam, lparam);
 }
 
 } // namespace NPAPIClient