Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugin...

chrome/renderer/pepper_scrollbar_widget.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_scrollbar_widget.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/renderer/pepper_devices.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/platform_device.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScrollbar.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebInputEvent;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebMouseWheelEvent;
 using WebKit::WebRect;
 using WebKit::WebScrollbar;
 using WebKit::WebVector;
 
@@ skipping 264 matching lines @@
     tickmarks->assign(rects, 0);
   } else {
     tickmarks->assign(&tickmarks_[0], tickmarks_.size());
   }
 }
 
 void PepperScrollbarWidget::NotifyInvalidate() {
   if (!dirty_rect_.IsEmpty())
     WidgetPropertyChanged(NPWidgetPropertyDirtyRect);
 }