commit 1b8b342be4a2613472ae80e20990a2398c77f207
author Hector Dearman <hjd@google.com> Tue Mar 26 16:54:08 2019 +0000
committer Hector Dearman <hjd@google.com> Tue Mar 26 16:54:08 2019 +0000
tree cb9f8fd004ed38606e9364dbef22484db1868be6
parent fbfa134ff264976ebb80fd6180eaf309db9d12eb

trace_to_text: Rename legacy functions

Change-Id: I6469e1c673741725e51e1805ae0e4e5a725933ef

tools/trace_to_text/main.cc

diff --git a/tools/trace_to_text/main.cc b/tools/trace_to_text/main.cc
index f789619..43246f6 100644
--- a/tools/trace_to_text/main.cc
+++ b/tools/trace_to_text/main.cc
@@ -84,17 +84,19 @@
   std::string format(argv[1]);
 
   if (format == "old_json")
+    return perfetto::trace_to_text::TraceToSystraceLegacy(
+        input_stream, output_stream,
+        /*wrap_in_json=*/true);
+  if (format == "json")
     return perfetto::trace_to_text::TraceToSystrace(input_stream, output_stream,
                                                     /*wrap_in_json=*/true);
-  if (format == "json")
-    return perfetto::trace_to_text::TraceToExperimentalSystrace(
-        input_stream, output_stream, /*wrap_in_json=*/true);
   if (format == "old_systrace")
+    return perfetto::trace_to_text::TraceToSystraceLegacy(
+        input_stream, output_stream,
+        /*wrap_in_json=*/false);
+  if (format == "systrace")
     return perfetto::trace_to_text::TraceToSystrace(input_stream, output_stream,
                                                     /*wrap_in_json=*/false);
-  if (format == "systrace")
-    return perfetto::trace_to_text::TraceToExperimentalSystrace(
-        input_stream, output_stream, /*wrap_in_json=*/false);
   if (format == "text")
     return perfetto::trace_to_text::TraceToText(input_stream, output_stream);