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

webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h

-// 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.
 
-#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H__
-#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H__
+#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H_
+#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H_
 
 #include "build/build_config.h"
-#include "webkit/glue/plugins/test/plugin_test.h"
+#include "webkit/plugins/npapi/test/plugin_test.h"
 
 namespace NPAPIClient {
 
 // The NPObjectLifeTime class tests the case where a plugin has an NPObject
 // which points to a different plugin instance on a different frame in the
 // page and whether refcounts on this npobject are valid when the source frame
 // is destroyed.
 class NPObjectLifetimeTest : public PluginTest {
  public:
   // Constructor.
@@ skipping 50 matching lines @@
                                  unsigned long elapsed_milli_seconds);
   UINT_PTR timer_id_;
 #endif
 
  private:
   static NPObjectDeletePluginInNPN_Evaluate* g_npn_evaluate_test_instance_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(NPObjectDeletePluginInNPN_Evaluate);
 };
 
-} // namespace NPAPIClient
+}  // namespace NPAPIClient
 
-#endif  // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H__
+#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_NPOBJECT_LIFETIME_TEST_H_