Replace chrome string util with android base ones
Replaces <base/stringutils.h> with <android-base/stringutils.h>
Replaces base::StringPrintf with android::base::StringPrintf
This change is very mechanical, no change in program behavior only
library functions are being replaced.
Test: th
Change-Id: Ie5797a27ea3cdd3ff537216dc39dffeac052565e
diff --git a/common/file_fetcher.cc b/common/file_fetcher.cc
index 7134fd6..dd994ab 100644
--- a/common/file_fetcher.cc
+++ b/common/file_fetcher.cc
@@ -24,7 +24,7 @@
#include <base/location.h>
#include <base/logging.h>
#include <base/strings/string_util.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#include <brillo/streams/file_stream.h>
#include "update_engine/common/hardware_interface.h"
diff --git a/common/http_fetcher_unittest.cc b/common/http_fetcher_unittest.cc
index d5b319a..ac03729 100644
--- a/common/http_fetcher_unittest.cc
+++ b/common/http_fetcher_unittest.cc
@@ -35,7 +35,7 @@
#include <base/stl_util.h>
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_util.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#if BASE_VER >= 780000 // CrOS
#include <base/task/single_thread_task_executor.h>
#endif // BASE_VER >= 780000
@@ -88,8 +88,8 @@
static const char* kUnusedUrl = "unused://unused";
static inline string LocalServerUrlForPath(in_port_t port, const string& path) {
- string port_str = (port ? base::StringPrintf(":%hu", port) : "");
- return base::StringPrintf(
+ string port_str = (port ? android::base::StringPrintf(":%hu", port) : "");
+ return android::base::StringPrintf(
"http://127.0.0.1%s%s", port_str.c_str(), path.c_str());
}
@@ -272,7 +272,7 @@
string BigUrl(in_port_t port) const override {
return LocalServerUrlForPath(
- port, base::StringPrintf("/download/%d", kBigLength));
+ port, android::base::StringPrintf("/download/%d", kBigLength));
}
string SmallUrl(in_port_t port) const override {
return LocalServerUrlForPath(port, "/foo");
@@ -768,16 +768,17 @@
unique_ptr<HttpServer> server(this->test_.CreateServer());
ASSERT_TRUE(server->started_);
- this->loop_.PostTask(FROM_HERE,
- base::Bind(&StartTransfer,
- fetcher.get(),
- LocalServerUrlForPath(
- server->GetPort(),
- base::StringPrintf("/flaky/%d/%d/%d/%d",
- kBigLength,
- kFlakyTruncateLength,
- kFlakySleepEvery,
- kFlakySleepSecs))));
+ this->loop_.PostTask(
+ FROM_HERE,
+ base::Bind(&StartTransfer,
+ fetcher.get(),
+ LocalServerUrlForPath(
+ server->GetPort(),
+ android::base::StringPrintf("/flaky/%d/%d/%d/%d",
+ kBigLength,
+ kFlakyTruncateLength,
+ kFlakySleepEvery,
+ kFlakySleepSecs))));
this->loop_.Run();
// verify the data we get back
@@ -908,12 +909,13 @@
FROM_HERE,
base::Bind(StartTransfer,
fetcher.get(),
- LocalServerUrlForPath(port,
- base::StringPrintf("/flaky/%d/%d/%d/%d",
- kBigLength,
- kFlakyTruncateLength,
- kFlakySleepEvery,
- kFlakySleepSecs))));
+ LocalServerUrlForPath(
+ port,
+ android::base::StringPrintf("/flaky/%d/%d/%d/%d",
+ kBigLength,
+ kFlakyTruncateLength,
+ kFlakySleepEvery,
+ kFlakySleepSecs))));
this->loop_.Run();
EXPECT_EQ(1, delegate.times_transfer_complete_called_);
EXPECT_EQ(0, delegate.times_transfer_terminated_called_);
@@ -940,12 +942,13 @@
FROM_HERE,
base::Bind(StartTransfer,
fetcher.get(),
- LocalServerUrlForPath(port,
- base::StringPrintf("/flaky/%d/%d/%d/%d",
- kBigLength,
- kFlakyTruncateLength,
- kFlakySleepEvery,
- kFlakySleepSecs))));
+ LocalServerUrlForPath(
+ port,
+ android::base::StringPrintf("/flaky/%d/%d/%d/%d",
+ kBigLength,
+ kFlakyTruncateLength,
+ kFlakySleepEvery,
+ kFlakySleepSecs))));
// Terminating the transfer after 3 seconds gives it a chance to contact the
// server and enter the retry loop.
this->loop_.PostDelayedTask(FROM_HERE,
@@ -1031,8 +1034,8 @@
unique_ptr<HttpServer> server(this->test_.CreateServer());
ASSERT_TRUE(server->started_);
- for (size_t c = 0; c < std::size(kRedirectCodes); ++c) {
- const string url = base::StringPrintf(
+ for (size_t c = 0; c < base::size(kRedirectCodes); ++c) {
+ const string url = android::base::StringPrintf(
"/redirect/%d/download/%d", kRedirectCodes[c], kMediumLength);
RedirectTest(server.get(), true, url, this->test_.NewLargeFetcher());
}
@@ -1047,10 +1050,10 @@
string url;
for (int r = 0; r < kDownloadMaxRedirects; r++) {
- url += base::StringPrintf("/redirect/%d",
- kRedirectCodes[r % std::size(kRedirectCodes)]);
+ url += android::base::StringPrintf(
+ "/redirect/%d", kRedirectCodes[r % base::size(kRedirectCodes)]);
}
- url += base::StringPrintf("/download/%d", kMediumLength);
+ url += android::base::StringPrintf("/download/%d", kMediumLength);
RedirectTest(server.get(), true, url, this->test_.NewLargeFetcher());
}
@@ -1063,10 +1066,10 @@
string url;
for (int r = 0; r < kDownloadMaxRedirects + 1; r++) {
- url += base::StringPrintf("/redirect/%d",
- kRedirectCodes[r % std::size(kRedirectCodes)]);
+ url += android::base::StringPrintf(
+ "/redirect/%d", kRedirectCodes[r % base::size(kRedirectCodes)]);
}
- url += base::StringPrintf("/download/%d", kMediumLength);
+ url += android::base::StringPrintf("/download/%d", kMediumLength);
RedirectTest(server.get(), false, url, this->test_.NewLargeFetcher());
}
@@ -1118,7 +1121,7 @@
e = ranges.end();
it != e;
++it) {
- string tmp_str = base::StringPrintf("%jd+", it->first);
+ string tmp_str = android::base::StringPrintf("%jd+", it->first);
if (it->second > 0) {
base::StringAppendF(&tmp_str, "%jd", it->second);
multi_fetcher->AddRange(it->first, it->second);
@@ -1256,9 +1259,9 @@
ranges.push_back(make_pair(99, 0));
MultiTest(this->test_.NewLargeFetcher(3),
this->test_.fake_hardware(),
- LocalServerUrlForPath(
- server->GetPort(),
- base::StringPrintf("/error-if-offset/%d/2", kBigLength)),
+ LocalServerUrlForPath(server->GetPort(),
+ android::base::StringPrintf(
+ "/error-if-offset/%d/2", kBigLength)),
ranges,
"abcdefghijabcdefghijabcdejabcdefghijabcdef",
kBigLength - (99 - 25),
@@ -1279,9 +1282,9 @@
ranges.push_back(make_pair(99, 0));
MultiTest(this->test_.NewLargeFetcher(),
this->test_.fake_hardware(),
- LocalServerUrlForPath(
- server->GetPort(),
- base::StringPrintf("/error-if-offset/%d/3", kBigLength)),
+ LocalServerUrlForPath(server->GetPort(),
+ android::base::StringPrintf(
+ "/error-if-offset/%d/3", kBigLength)),
ranges,
"abcdefghijabcdefghijabcde", // only received the first chunk
25,
diff --git a/common/multi_range_http_fetcher.cc b/common/multi_range_http_fetcher.cc
index b5bf923..a7d339b 100644
--- a/common/multi_range_http_fetcher.cc
+++ b/common/multi_range_http_fetcher.cc
@@ -16,7 +16,7 @@
#include "update_engine/common/multi_range_http_fetcher.h"
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#include <algorithm>
#include <string>
@@ -183,7 +183,7 @@
}
std::string MultiRangeHttpFetcher::Range::ToString() const {
- std::string range_str = base::StringPrintf("%jd+", offset());
+ std::string range_str = android::base::StringPrintf("%jd+", offset());
if (HasLength())
range_str += std::to_string(length());
else
diff --git a/common/prefs_unittest.cc b/common/prefs_unittest.cc
index 77c746d..3cb04c7 100644
--- a/common/prefs_unittest.cc
+++ b/common/prefs_unittest.cc
@@ -26,7 +26,7 @@
#include <base/files/scoped_temp_dir.h>
#include <android-base/macros.h>
#include <base/strings/string_util.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@@ -282,18 +282,18 @@
}
TEST_F(PrefsTest, GetInt64Max) {
- ASSERT_TRUE(SetValue(
- kKey,
- base::StringPrintf("%" PRIi64, std::numeric_limits<int64_t>::max())));
+ ASSERT_TRUE(SetValue(kKey,
+ android::base::StringPrintf(
+ "%" PRIi64, std::numeric_limits<int64_t>::max())));
int64_t value;
EXPECT_TRUE(prefs_.GetInt64(kKey, &value));
EXPECT_EQ(std::numeric_limits<int64_t>::max(), value);
}
TEST_F(PrefsTest, GetInt64Min) {
- ASSERT_TRUE(SetValue(
- kKey,
- base::StringPrintf("%" PRIi64, std::numeric_limits<int64_t>::min())));
+ ASSERT_TRUE(SetValue(kKey,
+ android::base::StringPrintf(
+ "%" PRIi64, std::numeric_limits<int64_t>::min())));
int64_t value;
EXPECT_TRUE(prefs_.GetInt64(kKey, &value));
EXPECT_EQ(std::numeric_limits<int64_t>::min(), value);
@@ -328,7 +328,8 @@
EXPECT_TRUE(prefs_.SetInt64(kKey, std::numeric_limits<int64_t>::max()));
string value;
EXPECT_TRUE(base::ReadFileToString(prefs_dir_.Append(kKey), &value));
- EXPECT_EQ(base::StringPrintf("%" PRIi64, std::numeric_limits<int64_t>::max()),
+ EXPECT_EQ(android::base::StringPrintf("%" PRIi64,
+ std::numeric_limits<int64_t>::max()),
value);
}
@@ -336,7 +337,8 @@
EXPECT_TRUE(prefs_.SetInt64(kKey, std::numeric_limits<int64_t>::min()));
string value;
EXPECT_TRUE(base::ReadFileToString(prefs_dir_.Append(kKey), &value));
- EXPECT_EQ(base::StringPrintf("%" PRIi64, std::numeric_limits<int64_t>::min()),
+ EXPECT_EQ(android::base::StringPrintf("%" PRIi64,
+ std::numeric_limits<int64_t>::min()),
value);
}
diff --git a/common/subprocess.cc b/common/subprocess.cc
index 03ec22a..44734dc 100644
--- a/common/subprocess.cc
+++ b/common/subprocess.cc
@@ -31,7 +31,7 @@
#include <base/logging.h>
#include <base/posix/eintr_wrapper.h>
#include <base/strings/string_util.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#include <brillo/secure_blob.h>
#include "update_engine/common/utils.h"
diff --git a/common/subprocess_unittest.cc b/common/subprocess_unittest.cc
index 0cb7b37..2328693 100644
--- a/common/subprocess_unittest.cc
+++ b/common/subprocess_unittest.cc
@@ -32,7 +32,7 @@
#include <base/message_loop/message_loop.h>
#endif // BASE_VER < 780000
#include <base/strings/string_util.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#if BASE_VER >= 780000 // Chrome OS
#include <base/task/single_thread_task_executor.h>
#endif // BASE_VER >= 780000
@@ -247,7 +247,7 @@
vector<string> cmd = {
kBinPath "/sh",
"-c",
- base::StringPrintf(
+ android::base::StringPrintf(
// The 'sleep' launched below could be left behind as an orphaned
// process when the 'sh' process is terminated by SIGTERM. As a
// remedy, trap SIGTERM and kill the 'sleep' process, which requires
diff --git a/common/utils.cc b/common/utils.cc
index 53ef8d0..191e95a 100644
--- a/common/utils.cc
+++ b/common/utils.cc
@@ -52,7 +52,7 @@
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_split.h>
#include <base/strings/string_util.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#include <brillo/data_encoding.h>
#include "update_engine/common/constants.h"
@@ -913,13 +913,13 @@
string ToString(const Time utc_time) {
Time::Exploded exp_time{};
utc_time.UTCExplode(&exp_time);
- return base::StringPrintf("%d/%d/%d %d:%02d:%02d GMT",
- exp_time.month,
- exp_time.day_of_month,
- exp_time.year,
- exp_time.hour,
- exp_time.minute,
- exp_time.second);
+ return android::base::StringPrintf("%d/%d/%d %d:%02d:%02d GMT",
+ exp_time.month,
+ exp_time.day_of_month,
+ exp_time.year,
+ exp_time.hour,
+ exp_time.minute,
+ exp_time.second);
}
string ToString(bool b) {
@@ -1005,9 +1005,9 @@
size_t payload_size) {
string encoded_hash = brillo::data_encoding::Base64Encode(
brillo::data_encoding::Base64Encode(payload_hash));
- return base::StringPrintf("cros_update_size_%" PRIuS "_hash_%s",
- payload_size,
- encoded_hash.c_str());
+ return android::base::StringPrintf("cros_update_size_%" PRIuS "_hash_%s",
+ payload_size,
+ encoded_hash.c_str());
}
bool ConvertToOmahaInstallDate(Time time, int* out_num_days) {