Revert 287325 because it breaks smoothness benchmarks on windows: "ValueError: LatencyInfo has no b…

trunk/src/cc/trees/layer_tree_host_unittest.cc

 // Copyright 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 "cc/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/synchronization/lock.h"
@@ skipping 4442 matching lines @@
   }
 
   virtual void DidNotSwap(DidNotSwapReason reason) OVERRIDE {
     base::AutoLock lock(result_->lock);
     EXPECT_FALSE(result_->did_swap_called);
     EXPECT_FALSE(result_->did_not_swap_called);
     result_->did_not_swap_called = true;
     result_->reason = reason;
   }
 
-  virtual int64 TraceId() const OVERRIDE { return 0; }
-
  private:
   // Not owned.
   TestSwapPromiseResult* result_;
 };
 
 class LayerTreeHostTestBreakSwapPromise : public LayerTreeHostTest {
  protected:
   LayerTreeHostTestBreakSwapPromise()
       : commit_count_(0), commit_complete_count_(0) {}
 
@@ skipping 110 matching lines @@
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestBreakSwapPromiseForAbortedCommit);
 
 class SimpleSwapPromiseMonitor : public SwapPromiseMonitor {
  public:
   SimpleSwapPromiseMonitor(LayerTreeHost* layer_tree_host,
                            LayerTreeHostImpl* layer_tree_host_impl,
                            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() {}
 
   virtual void OnSetNeedsCommitOnMain() OVERRIDE {
     (*set_needs_commit_count_)++;
   }
 
   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 {
  public:
   virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); }
 
   virtual void WillBeginMainFrame() OVERRIDE {
     int set_needs_commit_count = 0;
     int set_needs_redraw_count = 0;
 
@@ skipping 348 matching lines @@
   const gfx::Size bounds_;
   FakeContentLayerClient client_;
   scoped_refptr<ContentLayerWithUpdateTracking> content_layer_;
   scoped_refptr<FakePictureLayer> picture_layer_;
   Layer* child_layer_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestContinuousPainting);
 
 }  // namespace cc