cc: Allow the main thread to cancel commits

cc/test/layer_test_common.h

 // 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.
 
 #ifndef CC_TEST_LAYER_TEST_COMMON_H_
 #define CC_TEST_LAYER_TEST_COMMON_H_
 
-#define EXPECT_SET_NEEDS_COMMIT(expect, code_to_test) do {                \
-    EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times((expect));   \
-    code_to_test;                                                         \
-    Mock::VerifyAndClearExpectations(layer_tree_host_.get());           \
+#define EXPECT_SET_NEEDS_COMMIT(expect, code_to_test)                 \
+  do {                                                                \
+    EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times((expect)); \
+    code_to_test;                                                     \
+    Mock::VerifyAndClearExpectations(layer_tree_host_.get());         \
+  } while (false)
+
+#define EXPECT_SET_NEEDS_UPDATE(expect, code_to_test)                       \
+  do {                                                                      \
+    EXPECT_CALL(*layer_tree_host_, SetNeedsUpdateLayers()).Times((expect)); \
+    code_to_test;                                                           \
+    Mock::VerifyAndClearExpectations(layer_tree_host_.get());               \
   } while (false)
 
 namespace gfx { class Rect; }
 
 namespace cc {
 class QuadList;
 
 class LayerTestCommon {
  public:
   static const char* quad_string;
 
   static void VerifyQuadsExactlyCoverRect(const cc::QuadList& quads,
                                           gfx::Rect rect);
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TEST_COMMON_H_