Get rid of temporary scrollbar code now that WebKit is rolled.

webkit/plugins/ppapi/ppb_scrollbar_impl.cc

 // Copyright (c) 2011 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 "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "ppapi/c/dev/ppp_scrollbar_dev.h"
 #include "ppapi/thunk/thunk.h"
@@ skipping 107 matching lines @@
 
 PPB_Scrollbar_Impl::PPB_Scrollbar_Impl(PluginInstance* instance)
     : PPB_Widget_Impl(instance),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
 PPB_Scrollbar_Impl::~PPB_Scrollbar_Impl() {
 }
 
 void PPB_Scrollbar_Impl::Init(bool vertical) {
-#if defined(WEBSCROLLBAR_SUPPORTS_OVERLAY)
   scrollbar_.reset(WebScrollbar::createForPlugin(
       vertical ? WebScrollbar::Vertical : WebScrollbar::Horizontal,
       instance()->container(),
       static_cast<WebKit::WebScrollbarClient*>(this)));
-#else
-  scrollbar_.reset(WebScrollbar::create(
-      static_cast<WebKit::WebScrollbarClient*>(this),
-      vertical ? WebScrollbar::Vertical : WebScrollbar::Horizontal));
-#endif
 }
 
 PPB_Scrollbar_API* PPB_Scrollbar_Impl::AsPPB_Scrollbar_API() {
   return this;
 }
 
 // static
 const PPB_Scrollbar_0_3_Dev* PPB_Scrollbar_Impl::Get0_3Interface() {
   return &ppb_scrollbar_0_3;
 }
 
 // static
 const PPB_Scrollbar_0_4_Dev* PPB_Scrollbar_Impl::Get0_4Interface() {
   return &ppb_scrollbar_0_4;
 }
 
 uint32_t PPB_Scrollbar_Impl::GetThickness() {
   return WebScrollbar::defaultThickness();
 }
 
 bool PPB_Scrollbar_Impl::IsOverlay() {
-// TODO(jam): take this out once WebKit is rolled.
-#if defined(WEBSCROLLBAR_SUPPORTS_OVERLAY)
   return scrollbar_->isOverlay();
-#else
-  return false;
-#endif
 }
 
 uint32_t PPB_Scrollbar_Impl::GetValue() {
   return scrollbar_->value();
 }
 
 void PPB_Scrollbar_Impl::SetValue(uint32_t value) {
   scrollbar_->setValue(value);
 }
 
@@ skipping 136 matching lines @@
   pp_rect.point.y = dirty_.y();
   pp_rect.size.width = dirty_.width();
   pp_rect.size.height = dirty_.height();
   dirty_ = gfx::Rect();
   Invalidate(&pp_rect);
 }
 
 }  // namespace ppapi
 }  // namespace webkit