Unifies LayerTreeHost::SetNeedsUpdateLayers and SetNeedsAnimate -- V2

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 d01fbae1778d0fa4868c59028916ac7c31c1dd4d..6a1393e658ca7212a7fdbfb5b4aa5fdf37bea568 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -4754,17 +4754,6 @@ class LayerTreeHostTestSimpleSwapPromiseMonitor
       EXPECT_EQ(0, set_needs_redraw_count);
     }
 
-    {
-      scoped_ptr<SimpleSwapPromiseMonitor> swap_promise_monitor(
-          new SimpleSwapPromiseMonitor(layer_tree_host(),
-                                       NULL,
-                                       &set_needs_commit_count,
-                                       &set_needs_redraw_count));
-      layer_tree_host()->SetNeedsAnimate();
-      EXPECT_EQ(3, set_needs_commit_count);
-      EXPECT_EQ(0, set_needs_redraw_count);
-    }
-
     EndTest();
   }