Update from https://crrev.com/309717

cc/trees/layer_tree_host_common_perftest.cc

 // Copyright 2013 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_common.h"
 
 #include <sstream>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 62 matching lines @@
 
  protected:
   FakeContentLayerClient content_layer_client_;
   LapTimer timer_;
   std::string test_name_;
   std::string json_;
 };
 
 class CalcDrawPropsMainTest : public LayerTreeHostCommonPerfTest {
  public:
-  void RunCalcDrawProps() {
-    RunTest(false, false, false);
-  }
+  void RunCalcDrawProps() { RunTest(false, false, false); }
 
   void BeginTest() override {
     timer_.Reset();
 
     do {
       bool can_render_to_separate_surface = true;
       int max_texture_size = 8096;
       RenderSurfaceLayerList update_list;
       LayerTreeHostCommon::CalcDrawPropsMainInputs inputs(
           layer_tree_host()->root_layer(),
@@ skipping 221 matching lines @@
 
 TEST_F(LayerSorterMainTest, LayerSorterCubes) {
   SetTestName("layer_sort_cubes");
   ReadTestFile("layer_sort_cubes");
   RunSortLayers();
 }
 
 TEST_F(LayerSorterMainTest, LayerSorterRubik) {
   SetTestName("layer_sort_rubik");
   ReadTestFile("layer_sort_rubik");
+  // TODO(vollick): Remove verify_property_trees setting after
+  // crbug.com/444219 is fixed.
+  bool old_verify_property_trees = verify_property_trees();
+  set_verify_property_trees(false);
   RunSortLayers();
+  set_verify_property_trees(old_verify_property_trees);
 }
 
 TEST_F(BspTreePerfTest, BspTreeCubes) {
   SetTestName("bsp_tree_cubes");
   SetNumberOfDuplicates(1);
   ReadTestFile("layer_sort_cubes");
   RunSortLayers();
 }
 
 TEST_F(BspTreePerfTest, BspTreeRubik) {
   SetTestName("bsp_tree_rubik");
   SetNumberOfDuplicates(1);
   ReadTestFile("layer_sort_rubik");
+  // TODO(vollick): Remove verify_property_trees setting after
+  // crbug.com/444219 is fixed.
+  bool old_verify_property_trees = verify_property_trees();
+  set_verify_property_trees(false);
   RunSortLayers();
+  set_verify_property_trees(old_verify_property_trees);
 }
 
 TEST_F(BspTreePerfTest, BspTreeCubes_2) {
   SetTestName("bsp_tree_cubes_2");
   SetNumberOfDuplicates(2);
   ReadTestFile("layer_sort_cubes");
   RunSortLayers();
 }
 
 TEST_F(BspTreePerfTest, BspTreeCubes_4) {
   SetTestName("bsp_tree_cubes_4");
   SetNumberOfDuplicates(4);
   ReadTestFile("layer_sort_cubes");
   RunSortLayers();
 }
 
 }  // namespace
 }  // namespace cc