commit 0c18424d12141b4d5c4ef56fdb8851b124deaf5d
author Kelvin Zhang <zhangkelvin@google.com> Fri Oct 25 11:19:27 2024 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Fri Oct 25 11:23:06 2024 -0700
tree 83a94b1cb3eb31bb0fef7726b78eed268de51ce8
parent 1f46f5bb7b5b368e6d5431a3032503951bf34f88

Replace base string utils with android::base ones

Test: th
Change-Id: I62c1dfb24ec1dae3cdc5e0a0a93ea2b48e9967e5

payload_consumer/install_plan.cc

diff --git a/payload_consumer/install_plan.cc b/payload_consumer/install_plan.cc
index 58558f9..b55dea1 100644
--- a/payload_consumer/install_plan.cc
+++ b/payload_consumer/install_plan.cc
@@ -22,7 +22,6 @@
 #include <base/format_macros.h>
 #include <base/logging.h>
 #include <base/strings/string_number_conversions.h>
-#include <base/strings/string_util.h>
 #include <android-base/stringprintf.h>
 
 #include "update_engine/common/utils.h"
@@ -36,7 +35,7 @@
 namespace {
 string PayloadUrlsToString(
     const decltype(InstallPlan::Payload::payload_urls)& payload_urls) {
-  return "(" + base::JoinString(payload_urls, ",") + ")";
+  return "(" + android::base::Join(payload_urls, ",") + ")";
 }
 
 string VectorToString(const vector<std::pair<string, string>>& input,
@@ -46,9 +45,10 @@
                  input.end(),
                  std::back_inserter(vec),
                  [](const auto& pair) {
-                   return base::JoinString({pair.first, pair.second}, ": ");
+                   return android::base::Join(vector{pair.first, pair.second},
+                                              ": ");
                  });
-  return base::JoinString(vec, separator);
+  return android::base::Join(vec, separator);
 }
 }  // namespace
 
@@ -81,8 +81,7 @@
 
 string InstallPlan::ToString() const {
   string url_str = download_url;
-  if (base::StartsWith(
-          url_str, "fd://", base::CompareCase::INSENSITIVE_ASCII)) {
+  if (android::base::StartsWith(ToLower(url_str), "fd://")) {
     int fd = std::stoi(url_str.substr(strlen("fd://")));
     url_str = utils::GetFilePath(fd);
   }
@@ -145,7 +144,7 @@
         "\n  "));
   }
 
-  return base::JoinString(result_str, "\n");
+  return android::base::Join(result_str, "\n");
 }
 
 bool InstallPlan::LoadPartitionsFromSlots(BootControlInterface* boot_control) {