Revert "Implement scroll handler latency tracking"

cc/trees/layer_tree_host_unittest.cc

Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index b37d41b37e879af8c2b7fe33db78c784103d2c33..02696d84789129883487ce99db80847701d7f178 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -4432,8 +4432,6 @@ class TestSwapPromise : public SwapPromise {
     result_->reason = reason;
   }
 
-  virtual int64 TraceId() const OVERRIDE { return 0; }
-
  private:
   // Not owned.
   TestSwapPromiseResult* result_;
@@ -4520,7 +4518,8 @@ class SimpleSwapPromiseMonitor : public SwapPromiseMonitor {
                            int* set_needs_commit_count,
                            int* set_needs_redraw_count)
       : SwapPromiseMonitor(layer_tree_host, layer_tree_host_impl),
-        set_needs_commit_count_(set_needs_commit_count) {}
+        set_needs_commit_count_(set_needs_commit_count),
+        set_needs_redraw_count_(set_needs_redraw_count) {}
 
   virtual ~SimpleSwapPromiseMonitor() {}
 
@@ -4529,15 +4528,12 @@ class SimpleSwapPromiseMonitor : public SwapPromiseMonitor {
   }
 
   virtual void OnSetNeedsRedrawOnImpl() OVERRIDE {
-    ADD_FAILURE() << "Should not get called on main thread.";
-  }
-
-  virtual void OnForwardScrollUpdateToMainThreadOnImpl() OVERRIDE {
-    ADD_FAILURE() << "Should not get called on main thread.";
+    (*set_needs_redraw_count_)++;
   }
 
  private:
   int* set_needs_commit_count_;
+  int* set_needs_redraw_count_;
 };
 
 class LayerTreeHostTestSimpleSwapPromiseMonitor : public LayerTreeHostTest {