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.
(cherry picked from commit 0103c36caa2e38e034e0d22185736b9ccfb35c58)
Change-Id: I3dedd8b3f6e92ce8d3eeef99a76ad876c29db304
diff --git a/common/libcurl_http_fetcher.cc b/common/libcurl_http_fetcher.cc
index 13784fa..b735703 100644
--- a/common/libcurl_http_fetcher.cc
+++ b/common/libcurl_http_fetcher.cc
@@ -63,21 +63,21 @@
bool LibcurlHttpFetcher::GetProxyType(const string& proxy,
curl_proxytype* out_type) {
- if (base::StartsWithASCII(proxy, "socks5://", true) ||
- base::StartsWithASCII(proxy, "socks://", true)) {
+ if (base::StartsWith(proxy, "socks5://", base::CompareCase::SENSITIVE) ||
+ base::StartsWith(proxy, "socks://", base::CompareCase::SENSITIVE)) {
*out_type = CURLPROXY_SOCKS5_HOSTNAME;
return true;
}
- if (base::StartsWithASCII(proxy, "socks4://", true)) {
+ if (base::StartsWith(proxy, "socks4://", base::CompareCase::SENSITIVE)) {
*out_type = CURLPROXY_SOCKS4A;
return true;
}
- if (base::StartsWithASCII(proxy, "http://", true) ||
- base::StartsWithASCII(proxy, "https://", true)) {
+ if (base::StartsWith(proxy, "http://", base::CompareCase::SENSITIVE) ||
+ base::StartsWith(proxy, "https://", base::CompareCase::SENSITIVE)) {
*out_type = CURLPROXY_HTTP;
return true;
}
- if (base::StartsWithASCII(proxy, kNoProxy, true)) {
+ if (base::StartsWith(proxy, kNoProxy, base::CompareCase::SENSITIVE)) {
// known failure case. don't log.
return false;
}
@@ -193,7 +193,7 @@
// Lock down the appropriate curl options for HTTP or HTTPS depending on
// the url.
if (hardware_->IsOfficialBuild()) {
- if (base::StartsWithASCII(url_, "http://", false))
+ if (base::StartsWith(url_, "http://", base::CompareCase::INSENSITIVE_ASCII))
SetCurlOptionsForHttp();
else
SetCurlOptionsForHttps();