1 files changed, 16 insertions, 17 deletions
diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
index 9a9065d..5a17877 100644
--- a/cc/trees/layer_tree_host_perftest.cc
+++ b/cc/trees/layer_tree_host_perftest.cc
@@ -148,13 +148,13 @@ class LayerTreeHostPerfTestJsonReader : public LayerTreeHostPerfTest {
 TEST_F(LayerTreeHostPerfTestJsonReader, TenTenSingleThread) {
   SetTestName("10_10_single_thread");
   ReadTestFile("10_10_layer_tree");
-  RunTest(false, false, false);
+  RunTest(false, false);
 }
 
-TEST_F(LayerTreeHostPerfTestJsonReader, TenTenThreadedImplSide) {
+TEST_F(LayerTreeHostPerfTestJsonReader, TenTenThreaded) {
   SetTestName("10_10_threaded_impl_side");
   ReadTestFile("10_10_layer_tree");
-  RunTestWithImplSidePainting();
+  RunTest(true, false);
 }
 
 // Simulates a tab switcher scene with two stacks of 10 tabs each.
@@ -163,15 +163,14 @@ TEST_F(LayerTreeHostPerfTestJsonReader,
   full_damage_each_frame_ = true;
   SetTestName("10_10_single_thread_full_damage_each_frame");
   ReadTestFile("10_10_layer_tree");
-  RunTest(false, false, false);
+  RunTest(false, false);
 }
 
-TEST_F(LayerTreeHostPerfTestJsonReader,
-       TenTenThreadedImplSide_FullDamageEachFrame) {
+TEST_F(LayerTreeHostPerfTestJsonReader, TenTenThreaded_FullDamageEachFrame) {
   full_damage_each_frame_ = true;
   SetTestName("10_10_threaded_impl_side_full_damage_each_frame");
   ReadTestFile("10_10_layer_tree");
-  RunTestWithImplSidePainting();
+  RunTest(true, false);
 }
 
 // Invalidates a leaf layer in the tree on the main thread after every commit.
@@ -205,13 +204,13 @@ class LayerTreeHostPerfTestLeafInvalidates
 TEST_F(LayerTreeHostPerfTestLeafInvalidates, TenTenSingleThread) {
   SetTestName("10_10_single_thread_leaf_invalidates");
   ReadTestFile("10_10_layer_tree");
-  RunTest(false, false, false);
+  RunTest(false, false);
 }
 
-TEST_F(LayerTreeHostPerfTestLeafInvalidates, TenTenThreadedImplSide) {
+TEST_F(LayerTreeHostPerfTestLeafInvalidates, TenTenThreaded) {
   SetTestName("10_10_threaded_impl_side_leaf_invalidates");
   ReadTestFile("10_10_layer_tree");
-  RunTestWithImplSidePainting();
+  RunTest(true, false);
 }
 
 // Simulates main-thread scrolling on each frame.
@@ -246,18 +245,18 @@ TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageSingleThread) {
   // crbug.com/444219 is fixed.
   bool old_verify_property_trees = verify_property_trees();
   set_verify_property_trees(false);
-  RunTest(false, false, false);
+  RunTest(false, false);
   set_verify_property_trees(old_verify_property_trees);
 }
 
-TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageThreadedImplSide) {
+TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageThreaded) {
   SetTestName("long_scrollable_page_threaded_impl_side");
   ReadTestFile("long_scrollable_page");
   // 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);
-  RunTestWithImplSidePainting();
+  RunTest(true, false);
   set_verify_property_trees(old_verify_property_trees);
 }
 
@@ -327,20 +326,20 @@ class BrowserCompositorInvalidateLayerTreePerfTest
   bool clean_up_started_;
 };
 
-TEST_F(BrowserCompositorInvalidateLayerTreePerfTest, DenseBrowserUI) {
+TEST_F(BrowserCompositorInvalidateLayerTreePerfTest, DenseBrowserUIThreaded) {
   measure_commit_cost_ = true;
   SetTestName("dense_layer_tree");
   ReadTestFile("dense_layer_tree");
-  RunTestWithImplSidePainting();
+  RunTest(true, false);
 }
 
 // Simulates a page with several large, transformed and animated layers.
-TEST_F(LayerTreeHostPerfTestJsonReader, HeavyPageThreadedImplSide) {
+TEST_F(LayerTreeHostPerfTestJsonReader, HeavyPageThreaded) {
   begin_frame_driven_drawing_ = true;
   measure_commit_cost_ = true;
   SetTestName("heavy_page");
   ReadTestFile("heavy_layer_tree");
-  RunTestWithImplSidePainting();
+  RunTest(true, false);
 }
 
 }  // namespace