Roll Mojo to b88737ed62969ce3203085748f0d53ff4f09ba5b.

mojo/services/network/url_loader_impl.cc

Index: mojo/services/network/url_loader_impl.cc
diff --git a/mojo/services/network/url_loader_impl.cc b/mojo/services/network/url_loader_impl.cc
index 4dea9b7e9d39f37596f33cae2c5442245a56487d..8d305bc61f2b7da672e02f72a6c36c66ae693d9c 100644
--- a/mojo/services/network/url_loader_impl.cc
+++ b/mojo/services/network/url_loader_impl.cc
@@ -103,11 +103,11 @@ class UploadDataPipeElementReader : public net::UploadElementReader {
   DISALLOW_COPY_AND_ASSIGN(UploadDataPipeElementReader);
 };
 
-bool IsValidCacheMode(int cache_mode) {
+bool IsValidCacheMode(URLRequest::CacheMode cache_mode) {
   switch (cache_mode) {
-    case URLRequest::CACHE_MODE_DEFAULT:
-    case URLRequest::CACHE_MODE_BYPASS_CACHE:
-    case URLRequest::CACHE_MODE_ONLY_FROM_CACHE:
+    case URLRequest::CacheMode::DEFAULT:
+    case URLRequest::CacheMode::BYPASS_CACHE:
+    case URLRequest::CacheMode::ONLY_FROM_CACHE:
       return true;
   }
   return false;
@@ -572,12 +572,12 @@ void URLLoaderImpl::StartInternal(URLRequestPtr request) {
   }
   int load_flags = 0;
   switch (request->cache_mode) {
-    case URLRequest::CACHE_MODE_DEFAULT:
+    case URLRequest::CacheMode::DEFAULT:
       break;
-    case URLRequest::CACHE_MODE_BYPASS_CACHE:
+    case URLRequest::CacheMode::BYPASS_CACHE:
       load_flags |= net::LOAD_BYPASS_CACHE;
       break;
-    case URLRequest::CACHE_MODE_ONLY_FROM_CACHE:
+    case URLRequest::CacheMode::ONLY_FROM_CACHE:
       load_flags |= net::LOAD_ONLY_FROM_CACHE;
       break;
   }