commit 6005f1179a65bd5e6c63b224a6aaa6ed7b18deeb
author Florian Mayer <fmayer@google.com> Wed Dec 23 17:37:57 2020 +0000
committer Florian Mayer <fmayer@google.com> Wed Dec 23 17:37:57 2020 +0000
tree 32c059edc3d12340fc4932900a07bb94f7ad957e
parent 815ee4029d9e4804c5950bc73d4b5a53679ae53d

Simplify GetPerfettoBinaryPath.

Change-Id: Ic710a77f8bc5d3a07d40a34477025c813dd994d0

src/profiling/symbolizer/local_symbolizer.cc

diff --git a/src/profiling/symbolizer/local_symbolizer.cc b/src/profiling/symbolizer/local_symbolizer.cc
index 75c3c50..0a0ec4a 100644
--- a/src/profiling/symbolizer/local_symbolizer.cc
+++ b/src/profiling/symbolizer/local_symbolizer.cc
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (C) 2019 The Android Open Source Project
  *

src/profiling/symbolizer/symbolize_database.cc

diff --git a/src/profiling/symbolizer/symbolize_database.cc b/src/profiling/symbolizer/symbolize_database.cc
index 266b807..a002aea 100644
--- a/src/profiling/symbolizer/symbolize_database.cc
+++ b/src/profiling/symbolizer/symbolize_database.cc
@@ -21,8 +21,7 @@
 #include <vector>
 
 #include "perfetto/base/logging.h"
-#include "perfetto/ext/base/string_splitter.h"
-
+#include "perfetto/ext/base/string_utils.h"
 #include "perfetto/protozero/scattered_heap_buffer.h"
 #include "perfetto/trace_processor/trace_processor.h"
 
@@ -138,13 +137,10 @@
 }
 
 std::vector<std::string> GetPerfettoBinaryPath() {
-  std::vector<std::string> roots;
   const char* root = getenv("PERFETTO_BINARY_PATH");
-  if (root != nullptr) {
-    for (base::StringSplitter sp(std::string(root), ':'); sp.Next();)
-      roots.emplace_back(sp.cur_token(), sp.cur_token_size());
-  }
-  return roots;
+  if (root != nullptr)
+    return base::SplitString(root, ":");
+  return {};
 }
 
 }  // namespace profiling