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

webkit/glue/plugins/test/plugin_test.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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_test.h"
+#include "webkit/glue/plugins/test/plugin_test.h"
 
 #include "base/string_util.h"
-#include "webkit/plugins/npapi/test/npapi_constants.h"
+#include "webkit/glue/plugins/test/npapi_constants.h"
 
 namespace NPAPIClient {
 
 PluginTest::PluginTest(NPP id, NPNetscapeFuncs *host_functions) {
   id_ = id;
   id_->pdata = this;
   host_functions_ = host_functions;
   test_completed_ = false;
 }
 
@@ skipping 127 matching lines @@
   // There is no default action
   return 0;
 }
 
 void PluginTest::URLRedirectNotify(const char* url, int32_t status,
                                    void* notify_data) {
   // There is no default action
 }
 
 } // namespace NPAPIClient