update_engine: Update libchrome APIs to r369476
The new libchrome has been ported from Chromium and some APIs have
changed. Make necessary changes at call sites.
Change-Id: I42e65bda7f1dbdf6f6e0ebf356d2cfea6b729193
diff --git a/common/utils.cc b/common/utils.cc
index f1a357b..d3b5baa 100644
--- a/common/utils.cc
+++ b/common/utils.cc
@@ -89,8 +89,9 @@
// Return true if |disk_name| is an MTD or a UBI device. Note that this test is
// simply based on the name of the device.
bool IsMtdDeviceName(const string& disk_name) {
- return base::StartsWithASCII(disk_name, "/dev/ubi", true) ||
- base::StartsWithASCII(disk_name, "/dev/mtd", true);
+ return base::StartsWith(disk_name, "/dev/ubi",
+ base::CompareCase::SENSITIVE) ||
+ base::StartsWith(disk_name, "/dev/mtd", base::CompareCase::SENSITIVE);
}
// Return the device name for the corresponding partition on a NAND device.
@@ -133,8 +134,9 @@
// base::GetTempDir() and prepends it to |path|. On success stores the full
// temporary path in |template_path| and returns true.
bool GetTempName(const string& path, base::FilePath* template_path) {
- if (path[0] == '/' || base::StartsWithASCII(path, "./", true) ||
- base::StartsWithASCII(path, "../", true)) {
+ if (path[0] == '/' ||
+ base::StartsWith(path, "./", base::CompareCase::SENSITIVE) ||
+ base::StartsWith(path, "../", base::CompareCase::SENSITIVE)) {
*template_path = base::FilePath(path);
return true;
}
@@ -432,7 +434,8 @@
bool SplitPartitionName(const string& partition_name,
string* out_disk_name,
int* out_partition_num) {
- if (!base::StartsWithASCII(partition_name, "/dev/", true)) {
+ if (!base::StartsWith(partition_name, "/dev/",
+ base::CompareCase::SENSITIVE)) {
LOG(ERROR) << "Invalid partition device name: " << partition_name;
return false;
}
@@ -486,7 +489,7 @@
return string();
}
- if (!base::StartsWithASCII(disk_name, "/dev/", true)) {
+ if (!base::StartsWith(disk_name, "/dev/", base::CompareCase::SENSITIVE)) {
LOG(ERROR) << "Invalid disk name: " << disk_name;
return string();
}