commit 34b1f7a1ece566bc1b48a0a2c008a5948867b687
author Hector Dearman <hjd@google.com> Thu May 27 11:01:20 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 27 11:01:20 2021 +0000
tree e947f015ed3d712138b171645347c93df7712950
parent be406c7d16b36e0186d394f47b1bf006d5b1d8a7
parent 4fd776c535be53b8940c6d5f012885706c2ed78a

Merge "upkeep: Use base::Contains"

src/trace_processor/importers/proto/stack_profile_tracker.cc

diff --git a/src/trace_processor/importers/proto/stack_profile_tracker.cc b/src/trace_processor/importers/proto/stack_profile_tracker.cc
index 52e4dbd..6bf9a73 100644
--- a/src/trace_processor/importers/proto/stack_profile_tracker.cc
+++ b/src/trace_processor/importers/proto/stack_profile_tracker.cc
@@ -185,7 +185,7 @@
       cur_id = frames->Insert(row).id;
       context_->global_stack_profile_tracker->InsertFrameRow(
           mapping_id, static_cast<uint64_t>(row.rel_pc), *cur_id);
-      if (name.find('.') != std::string::npos) {
+      if (base::Contains(name, '.')) {
         // Java frames always contain a '.'
         base::Optional<std::string> package =
             PackageFromLocation(context_->storage.get(), mapping_name);

src/trace_processor/sqlite/span_join_operator_table.cc

diff --git a/src/trace_processor/sqlite/span_join_operator_table.cc b/src/trace_processor/sqlite/span_join_operator_table.cc
index c6c3b78..13fea5e 100644
--- a/src/trace_processor/sqlite/span_join_operator_table.cc
+++ b/src/trace_processor/sqlite/span_join_operator_table.cc
@@ -210,7 +210,7 @@
   // Check if any column has : in its name. This often happens when SELECT *
   // is used to create a view with the same column name in two joined tables.
   for (const auto& col : cols) {
-    if (col.name().find(':') != std::string::npos) {
+    if (base::Contains(col.name(), ':')) {
       return util::ErrStatus("SPAN_JOIN: column %s has illegal character :",
                              col.name().c_str());
     }