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

chrome/plugin/plugin_thread.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 CHROME_PLUGIN_PLUGIN_THREAD_H_
 #define CHROME_PLUGIN_PLUGIN_THREAD_H_
 #pragma once
 
 #include "base/file_path.h"
 #include "base/native_library.h"
 #include "build/build_config.h"
 #include "chrome/common/child_thread.h"
 #include "chrome/plugin/plugin_channel.h"
-#include "webkit/plugins/npapi/plugin_lib.h"
+#include "webkit/glue/plugins/plugin_lib.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
 // The PluginThread class represents a background thread where plugin instances
 // live.  Communication occurs between WebPluginDelegateProxy in the renderer
 // process and WebPluginDelegateStub in this thread through IPC messages.
 class PluginThread : public ChildThread {
  public:
@@ skipping 20 matching lines @@
   // The plugin module which is preloaded in Init
   base::NativeLibrary preloaded_plugin_module_;
 
   // Points to the plugin file that this process hosts.
   FilePath plugin_path_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginThread);
 };
 
 #endif  // CHROME_PLUGIN_PLUGIN_THREAD_H_