[HttpCache] LOAD_ONLY_FROM_CACHE should not imply LOAD_PREFERRING_CACHE

ios/net/crn_http_protocol_handler.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/net/crn_http_protocol_handler.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
@@ skipping 584 matching lines @@
     load_flags |= LOAD_DO_NOT_SEND_COOKIES | LOAD_DO_NOT_SAVE_COOKIES;
 
   // Cache flags.
   if (tracker_) {
     RequestTracker::CacheMode cache_mode = tracker_->GetCacheMode();
     switch (cache_mode) {
       case RequestTracker::CACHE_RELOAD:
         load_flags |= LOAD_VALIDATE_CACHE;
         break;
       case RequestTracker::CACHE_HISTORY:
-        load_flags |= LOAD_PREFERRING_CACHE;
+        load_flags |= LOAD_SKIP_CACHE_VALIDATION;
         break;
       case RequestTracker::CACHE_BYPASS:
         load_flags |= LOAD_DISABLE_CACHE | LOAD_BYPASS_CACHE;
         break;
       case RequestTracker::CACHE_ONLY:
-        load_flags |= LOAD_ONLY_FROM_CACHE;
+        load_flags |= LOAD_ONLY_FROM_CACHE | LOAD_SKIP_CACHE_VALIDATION;
         break;
       case RequestTracker::CACHE_NORMAL:
         // Do nothing, normal load.
         break;
     }
   } else {
     switch ([request_ cachePolicy]) {
       case NSURLRequestReloadIgnoringLocalAndRemoteCacheData:
         load_flags |= LOAD_BYPASS_CACHE;
       case NSURLRequestReloadIgnoringLocalCacheData:
         load_flags |= LOAD_DISABLE_CACHE;
         break;
       case NSURLRequestReturnCacheDataElseLoad:
-        load_flags |= LOAD_PREFERRING_CACHE;
+        load_flags |= LOAD_SKIP_CACHE_VALIDATION;
         break;
       case NSURLRequestReturnCacheDataDontLoad:
-        load_flags |= LOAD_ONLY_FROM_CACHE;
+        load_flags |= LOAD_ONLY_FROM_CACHE | LOAD_SKIP_CACHE_VALIDATION;
         break;
       case NSURLRequestReloadRevalidatingCacheData:
         load_flags |= LOAD_VALIDATE_CACHE;
         break;
       case NSURLRequestUseProtocolCachePolicy:
         // Do nothing, normal load.
         break;
     }
   }
   net_request_->SetLoadFlags(load_flags);
@@ skipping 456 matching lines @@
       [[DeferredCancellation alloc] initWithCore:[self getCore]];
   NSArray* modes = @[ [[NSRunLoop currentRunLoop] currentMode] ];
   [cancellation performSelector:@selector(cancel)
                        onThread:[self getClientThread]
                      withObject:nil
                   waitUntilDone:NO
                           modes:modes];
 }
 
 @end