Revert of 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 14f113fed4ddad5f6207eb0bcc12504e6e77b155..5c69225993170b1277045e0fce6bab3677863e5e 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -4460,8 +4460,6 @@
     result_->reason = reason;
   }
 
-  virtual int64 TraceId() const OVERRIDE { return 0; }
-
  private:
   // Not owned.
   TestSwapPromiseResult* result_;
@@ -4592,7 +4590,8 @@
                            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() {}
 
@@ -4601,15 +4600,12 @@
   }
 
   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 {