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

chrome/renderer/pepper_devices.cc

 // 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.
 
 #include "chrome/renderer/pepper_devices.h"
 
 #include "chrome/common/render_messages_params.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/webplugin_delegate_pepper.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/plugins/npapi/webplugin.h"
+#include "webkit/glue/plugins/plugin_instance.h"
+#include "webkit/glue/plugins/webplugin.h"
 
 namespace {
 
 const uint32 kBytesPerPixel = 4;  // Only 8888 RGBA for now.
 
 }  // namespace
 
 int Graphics2DDeviceContext::next_buffer_id_ = 0;
 
 struct Graphics2DDeviceContext::FlushCallbackData {
@@ skipping 270 matching lines @@
 }
 
 void AudioDeviceContext::Run() {
   int pending_data;
   while (sizeof(pending_data) == socket_->Receive(&pending_data,
                                                   sizeof(pending_data)) &&
       pending_data >= 0) {
     FireAudioCallback();
   }
 }