Remove WTF and WebCore from cc/ and webkit/compositor_bindings/

cc/scrollbar_animation_controller.cc

 // Copyright 2012 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 "config.h"
-
 #include "cc/scrollbar_animation_controller.h"
 
+#include "base/time.h"
+#include "build/build_config.h"
 #include "cc/scrollbar_layer_impl.h"
-#include "base/time.h"
 
-#if OS(ANDROID)
+#if defined(OS_ANDROID)
 #include "cc/scrollbar_animation_controller_linear_fade.h"
 #endif
 
 namespace cc {
 
-#if OS(ANDROID)
+#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));
@@ skipping 59 matching lines @@
     }
 
     if (m_verticalScrollbarLayer) {
         m_verticalScrollbarLayer->setCurrentPos(m_currentOffset.y());
         m_verticalScrollbarLayer->setTotalSize(m_totalSize.height());
         m_verticalScrollbarLayer->setMaximum(m_maximum.y());
     }
 }
 
 }  // namespace cc