cc: Don't use partial updates for scrollbars when they are not allowed.

cc/scrollbar_animation_controller.cc

Index: cc/scrollbar_animation_controller.cc
diff --git a/cc/scrollbar_animation_controller.cc b/cc/scrollbar_animation_controller.cc
index 1d9151b11e1556231341179f18fe919feb4a0c3f..f2e471c6428a53ed0594a29a849bb590cd0b014a 100644
--- a/cc/scrollbar_animation_controller.cc
+++ b/cc/scrollbar_animation_controller.cc
@@ -9,25 +9,12 @@
 #include "build/build_config.h"
 #include "cc/scrollbar_layer_impl.h"
 
-#if defined(OS_ANDROID)
-#include "cc/scrollbar_animation_controller_linear_fade.h"
-#endif
-
 namespace cc {
 
-#if defined(OS_ANDROID)
-scoped_ptr<ScrollbarAnimationController> ScrollbarAnimationController::create(LayerImpl* scrollLayer)
-{
-    static const double fadeoutDelay = 0.3;
-    static const double fadeoutLength = 0.3;
-    return ScrollbarAnimationControllerLinearFade::create(scrollLayer, fadeoutDelay, fadeoutLength).PassAs<ScrollbarAnimationController>();
-}
-#else
 scoped_ptr<ScrollbarAnimationController> ScrollbarAnimationController::create(LayerImpl* scrollLayer)
 {
     return make_scoped_ptr(new ScrollbarAnimationController(scrollLayer));
 }
-#endif
 
 ScrollbarAnimationController::ScrollbarAnimationController(LayerImpl* scrollLayer)
     : m_horizontalScrollbarLayer(0)