Update from https://crrev.com/309717

cc/test/layer_tree_test.h

Index: cc/test/layer_tree_test.h
diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h
index 1587f2c95b70edcf726468d98eca3ac171afd00f..3fae7b796dde6270eb4b2657a07470dabd9f7458 100644
--- a/cc/test/layer_tree_test.h
+++ b/cc/test/layer_tree_test.h
@@ -132,7 +132,7 @@ class TimeoutTask;
 // thread, but be aware that ending the test is an asynchronous process.
 class LayerTreeTest : public testing::Test, public TestHooks {
  public:
-  virtual ~LayerTreeTest();
+  ~LayerTreeTest() override;
 
   virtual void EndTest();
   void EndTestAfterDelayMs(int delay_milliseconds);
@@ -151,6 +151,11 @@ class LayerTreeTest : public testing::Test, public TestHooks {
   void DoBeginTest();
   void Timeout();
 
+  bool verify_property_trees() const { return verify_property_trees_; }
+  void set_verify_property_trees(bool verify_property_trees) {
+    verify_property_trees_ = verify_property_trees;
+  }
+
  protected:
   LayerTreeTest();
 
@@ -210,7 +215,6 @@ class LayerTreeTest : public testing::Test, public TestHooks {
 
   TestWebGraphicsContext3D* TestContext();
 
-
  private:
   LayerTreeSettings settings_;
   scoped_ptr<LayerTreeHostClientForTesting> client_;
@@ -225,6 +229,7 @@ class LayerTreeTest : public testing::Test, public TestHooks {
   bool started_;
   bool ended_;
   bool delegating_renderer_;
+  bool verify_property_trees_;
 
   int timeout_seconds_;