1 files changed, 16 insertions, 22 deletions
diff --git a/test/testsupport/perf_test.cc b/test/testsupport/perf_test.cc
index 5b2f7a0479..310c7e36a5 100644
--- a/test/testsupport/perf_test.cc
+++ b/test/testsupport/perf_test.cc
@@ -19,22 +19,26 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/critical_section.h"
-#include "test/testsupport/perf_test_graphjson_writer.h"
 #include "test/testsupport/perf_test_histogram_writer.h"
 
-ABSL_FLAG(bool,
-          write_histogram_proto_json,
-          true,
-          "Use the histogram C++ API, which will write Histogram protos "
-          "instead of Chart JSON. See histogram.proto in third_party/catapult. "
-          "This flag only has effect  if --isolated_script_test_perf_output is "
-          "specified");
-
 namespace webrtc {
 namespace test {
 
 namespace {
 
+std::string UnitWithDirection(
+    const std::string& units,
+    webrtc::test::ImproveDirection improve_direction) {
+  switch (improve_direction) {
+    case webrtc::test::ImproveDirection::kNone:
+      return units;
+    case webrtc::test::ImproveDirection::kSmallerIsBetter:
+      return units + "_smallerIsBetter";
+    case webrtc::test::ImproveDirection::kBiggerIsBetter:
+      return units + "_biggerIsBetter";
+  }
+}
+
 template <typename Container>
 void OutputListToStream(std::ostream* ostream, const Container& values) {
   const char* sep = "";
@@ -192,13 +196,8 @@ ResultsLinePrinter& GetResultsLinePrinter() {
 }
 
 PerfTestResultWriter& GetPerfWriter() {
-  if (absl::GetFlag(FLAGS_write_histogram_proto_json)) {
-    static PerfTestResultWriter* writer = CreateHistogramWriter();
-    return *writer;
-  } else {
-    static PerfTestResultWriter* writer = CreateGraphJsonWriter();
-    return *writer;
-  }
+  static PerfTestResultWriter* writer = CreateHistogramWriter();
+  return *writer;
 }
 
 }  // namespace
@@ -222,12 +221,7 @@ void PrintPlottableResults(const std::vector<std::string>& desired_graphs) {
 
 bool WritePerfResults(const std::string& output_path) {
   std::string results = GetPerfResults();
-  FILE* output;
-  if (absl::GetFlag(FLAGS_write_histogram_proto_json)) {
-    output = fopen(output_path.c_str(), "wb");
-  } else {
-    output = fopen(output_path.c_str(), "w");
-  }
+  FILE* output = fopen(output_path.c_str(), "wb");
   if (output == NULL) {
     printf("Failed to write to %s.\n", output_path.c_str());
     return false;