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

webkit/plugins/npapi/test/plugin_test.h

 // 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_PORT_PLUGINS_TEST_PLUGIN_TEST_H_
-#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_H_
+#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_H_
+#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_H_
 
 #include <string>
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/nphostapi.h"
 
 namespace NPAPIClient {
 
@@ skipping 105 matching lines @@
   bool test_completed() const { return test_completed_; }
  private:
   NPP                       id_;
   NPNetscapeFuncs *         host_functions_;
   std::string               test_name_;
   std::string               test_id_;
   std::string               test_status_;
   bool                      test_completed_;
 };
 
-} // namespace NPAPIClient
+}  // namespace NPAPIClient
 
-#endif  // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_H_
+#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_H_