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/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);
}