base::StartsWithASCII() -> base::StartsWith(). Will be needed for a //base update. (These changes correspond to Chromium base changes at Chromium revision 955093110ad64d5ec6f5426991efaa4a680b5d6f. R=johnmccutchan@google.com Review URL: https://codereview.chromium.org/2006303002 .
diff --git a/dart_library_provider_files.cc b/dart_library_provider_files.cc index 25a3001..89aeefe 100644 --- a/dart_library_provider_files.cc +++ b/dart_library_provider_files.cc
@@ -62,7 +62,7 @@ } std::string DartLibraryProviderFiles::CanonicalizePackageURL(std::string url) { - DCHECK(base::StartsWithASCII(url, "package:", true)); + DCHECK(base::StartsWith(url, "package:", base::CompareCase::SENSITIVE)); base::ReplaceFirstSubstringAfterOffset(&url, 0, "package:", ""); return package_root_.Append(url).AsUTF8Unsafe(); } @@ -70,9 +70,9 @@ Dart_Handle DartLibraryProviderFiles::CanonicalizeURL(Dart_Handle library, Dart_Handle url) { std::string string = StdStringFromDart(url); - if (base::StartsWithASCII(string, "dart:", true)) + if (base::StartsWith(string, "dart:", base::CompareCase::SENSITIVE)) return url; - if (base::StartsWithASCII(string, "package:", true)) + if (base::StartsWith(string, "package:", base::CompareCase::SENSITIVE)) return StdStringToDart(CanonicalizePackageURL(string)); base::FilePath base_path(StdStringFromDart(Dart_LibraryUrl(library))); base::FilePath resolved_path = base_path.DirName().Append(string);
diff --git a/dart_library_provider_network.cc b/dart_library_provider_network.cc index 635d07e..8697a4b 100644 --- a/dart_library_provider_network.cc +++ b/dart_library_provider_network.cc
@@ -81,10 +81,10 @@ Dart_Handle DartLibraryProviderNetwork::CanonicalizeURL(Dart_Handle library, Dart_Handle url) { std::string string = StdStringFromDart(url); - if (base::StartsWithASCII(string, "dart:", true)) + if (base::StartsWith(string, "dart:", base::CompareCase::SENSITIVE)) return url; // TODO(abarth): The package root should be configurable. - if (base::StartsWithASCII(string, "package:", true)) + if (base::StartsWith(string, "package:", base::CompareCase::SENSITIVE)) base::ReplaceFirstSubstringAfterOffset(&string, 0, "package:", "/packages/"); GURL library_url(StdStringFromDart(Dart_LibraryUrl(library)));