1 files changed, 24 insertions, 23 deletions

diff --git a/chromium/cc/trees/layer_tree_host_perftest.cc b/chromium/cc/trees/layer_tree_host_perftest.cc
index 379d099def3..7d9e9d4f2a9 100644
--- a/chromium/cc/trees/layer_tree_host_perftest.cc
+++ b/chromium/cc/trees/layer_tree_host_perftest.cc
@@ -27,7 +27,7 @@
 #include "components/viz/test/paths.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/common/sync_token.h"
-#include "testing/perf/perf_test.h"
+#include "testing/perf/perf_result_reporter.h"
 
 namespace cc {
 namespace {
@@ -99,6 +99,13 @@ class LayerTreeHostPerfTest : public LayerTreeTest {
       host_impl->SetFullViewportDamage();
   }
 
+  void SetUpReporter(const std::string& story_name) {
+    reporter_ = std::make_unique<perf_test::PerfResultReporter>(
+        "layer_tree_host", story_name);
+    reporter_->RegisterImportantMetric("_frame_time", "us");
+    reporter_->RegisterImportantMetric("_commit_time", "us");
+  }
+
   virtual void CleanUpAndEndTest() { EndTest(); }
 
   virtual bool CleanUpStarted() { return false; }
@@ -106,14 +113,12 @@ class LayerTreeHostPerfTest : public LayerTreeTest {
   virtual void BuildTree() {}
 
   void AfterTest() override {
-    CHECK(!test_name_.empty()) << "Must SetTestName() before AfterTest().";
-    perf_test::PrintResult("layer_tree_host_frame_time", "", test_name_,
-                           draw_timer_.TimePerLap().InMicrosecondsF(), "us",
-                           true);
+    CHECK(reporter_) << "Must SetUpReporter() before AfterTest().";
+    reporter_->AddResult("_frame_time",
+                         draw_timer_.TimePerLap().InMicrosecondsF());
     if (measure_commit_cost_) {
-      perf_test::PrintResult("layer_tree_host_commit_time", "", test_name_,
-                             commit_timer_.TimePerLap().InMicrosecondsF(), "us",
-                             true);
+      reporter_->AddResult("_commit_time",
+                           commit_timer_.TimePerLap().InMicrosecondsF());
     }
   }
 
@@ -121,7 +126,7 @@ class LayerTreeHostPerfTest : public LayerTreeTest {
   base::LapTimer draw_timer_;
   base::LapTimer commit_timer_;
 
-  std::string test_name_;
+  std::unique_ptr<perf_test::PerfResultReporter> reporter_;
   FakeContentLayerClient fake_content_layer_client_;
   bool full_damage_each_frame_;
   bool begin_frame_driven_drawing_;
@@ -136,10 +141,6 @@ class LayerTreeHostPerfTestJsonReader : public LayerTreeHostPerfTest {
       : LayerTreeHostPerfTest() {
   }
 
-  void SetTestName(const std::string& name) {
-    test_name_ = name;
-  }
-
   void ReadTestFile(const std::string& name) {
     base::FilePath test_data_dir;
     ASSERT_TRUE(
@@ -171,7 +172,7 @@ class LayerTreeHostPerfTestJsonReader : public LayerTreeHostPerfTest {
 #define MAYBE_TenTenSingleThread TenTenSingleThread
 #endif
 TEST_F(LayerTreeHostPerfTestJsonReader, MAYBE_TenTenSingleThread) {
-  SetTestName("10_10_single_thread");
+  SetUpReporter("10_10_single_thread");
   ReadTestFile("10_10_layer_tree");
   RunTest(CompositorMode::SINGLE_THREADED);
 }
@@ -183,7 +184,7 @@ TEST_F(LayerTreeHostPerfTestJsonReader, MAYBE_TenTenSingleThread) {
 #define MAYBE_TenTenThreaded TenTenThreaded
 #endif
 TEST_F(LayerTreeHostPerfTestJsonReader, MAYBE_TenTenThreaded) {
-  SetTestName("10_10_threaded_impl_side");
+  SetUpReporter("10_10_threaded_impl_side");
   ReadTestFile("10_10_layer_tree");
   RunTest(CompositorMode::THREADED);
 }
@@ -192,14 +193,14 @@ TEST_F(LayerTreeHostPerfTestJsonReader, MAYBE_TenTenThreaded) {
 TEST_F(LayerTreeHostPerfTestJsonReader,
        TenTenSingleThread_FullDamageEachFrame) {
   full_damage_each_frame_ = true;
-  SetTestName("10_10_single_thread_full_damage_each_frame");
+  SetUpReporter("10_10_single_thread_full_damage_each_frame");
   ReadTestFile("10_10_layer_tree");
   RunTest(CompositorMode::SINGLE_THREADED);
 }
 
 TEST_F(LayerTreeHostPerfTestJsonReader, TenTenThreaded_FullDamageEachFrame) {
   full_damage_each_frame_ = true;
-  SetTestName("10_10_threaded_impl_side_full_damage_each_frame");
+  SetUpReporter("10_10_threaded_impl_side_full_damage_each_frame");
   ReadTestFile("10_10_layer_tree");
   RunTest(CompositorMode::THREADED);
 }
@@ -233,14 +234,14 @@ class LayerTreeHostPerfTestLeafInvalidates
 // Simulates a tab switcher scene with two stacks of 10 tabs each. Invalidate a
 // property on a leaf layer in the tree every commit.
 TEST_F(LayerTreeHostPerfTestLeafInvalidates, TenTenSingleThread) {
-  SetTestName("10_10_single_thread_leaf_invalidates");
+  SetUpReporter("10_10_single_thread_leaf_invalidates");
   ReadTestFile("10_10_layer_tree");
   RunTest(CompositorMode::SINGLE_THREADED);
 }
 
 // Timed out on Android: http://crbug.com/723821
 TEST_F(LayerTreeHostPerfTestLeafInvalidates, MAYBE_TenTenThreaded) {
-  SetTestName("10_10_threaded_impl_side_leaf_invalidates");
+  SetUpReporter("10_10_threaded_impl_side_leaf_invalidates");
   ReadTestFile("10_10_layer_tree");
   RunTest(CompositorMode::THREADED);
 }
@@ -278,7 +279,7 @@ class ScrollingLayerTreePerfTest : public LayerTreeHostPerfTestJsonReader {
 #define MAYBE_LongScrollablePageSingleThread LongScrollablePageSingleThread
 #endif
 TEST_F(ScrollingLayerTreePerfTest, MAYBE_LongScrollablePageSingleThread) {
-  SetTestName("long_scrollable_page");
+  SetUpReporter("long_scrollable_page");
   ReadTestFile("long_scrollable_page");
   RunTest(CompositorMode::SINGLE_THREADED);
 }
@@ -290,7 +291,7 @@ TEST_F(ScrollingLayerTreePerfTest, MAYBE_LongScrollablePageSingleThread) {
 #define MAYBE_LongScrollablePageThreaded LongScrollablePageThreaded
 #endif
 TEST_F(ScrollingLayerTreePerfTest, MAYBE_LongScrollablePageThreaded) {
-  SetTestName("long_scrollable_page_threaded_impl_side");
+  SetUpReporter("long_scrollable_page_threaded_impl_side");
   ReadTestFile("long_scrollable_page");
   RunTest(CompositorMode::THREADED);
 }
@@ -382,7 +383,7 @@ class BrowserCompositorInvalidateLayerTreePerfTest
 
 TEST_F(BrowserCompositorInvalidateLayerTreePerfTest, DenseBrowserUIThreaded) {
   measure_commit_cost_ = true;
-  SetTestName("dense_layer_tree");
+  SetUpReporter("dense_layer_tree");
   ReadTestFile("dense_layer_tree");
   RunTest(CompositorMode::THREADED);
 }
@@ -397,7 +398,7 @@ TEST_F(BrowserCompositorInvalidateLayerTreePerfTest, DenseBrowserUIThreaded) {
 TEST_F(LayerTreeHostPerfTestJsonReader, MAYBE_HeavyPageThreaded) {
   begin_frame_driven_drawing_ = true;
   measure_commit_cost_ = true;
-  SetTestName("heavy_page");
+  SetUpReporter("heavy_page");
   ReadTestFile("heavy_layer_tree");
   RunTest(CompositorMode::THREADED);
 }