Landing Recent QUIC changes until 3:24 PM, Oct 01, 2016 UTC-4

net/tools/quic/quic_in_memory_cache.cc

Index: net/tools/quic/quic_in_memory_cache.cc
diff --git a/net/tools/quic/quic_in_memory_cache.cc b/net/tools/quic/quic_in_memory_cache.cc
index ab2ad1e6c4026f3209583e1cc5eb0e99dfce0504..a63f4996e76ea42fad71a64d32c511cf0b1b63c2 100644
--- a/net/tools/quic/quic_in_memory_cache.cc
+++ b/net/tools/quic/quic_in_memory_cache.cc
@@ -119,9 +119,10 @@ void QuicInMemoryCache::ResourceFile::SetHostPathFromBase(StringPiece base) {
 }
 
 StringPiece QuicInMemoryCache::ResourceFile::RemoveScheme(StringPiece url) {
-  if (url.starts_with("https://")) {
+  if (base::StartsWith(url, "https://", base::CompareCase::INSENSITIVE_ASCII)) {
     url.remove_prefix(8);
-  } else if (url.starts_with("http://")) {
+  } else if (base::StartsWith(url, "http://",
+                              base::CompareCase::INSENSITIVE_ASCII)) {
     url.remove_prefix(7);
   }
   return url;