[2/3 chromium] Support redirect option of Request and "opaqueredirect" response type.

content/browser/cache_storage/cache_storage_cache.cc

 // Copyright 2014 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.
 
 #include "content/browser/cache_storage/cache_storage_cache.h"
 
 #include <string>
 
 #include "base/barrier_closure.h"
 #include "base/files/file_path.h"
@@ skipping 58 matching lines @@
     case CacheResponse::BASIC_TYPE:
       return blink::WebServiceWorkerResponseTypeBasic;
     case CacheResponse::CORS_TYPE:
       return blink::WebServiceWorkerResponseTypeCORS;
     case CacheResponse::DEFAULT_TYPE:
       return blink::WebServiceWorkerResponseTypeDefault;
     case CacheResponse::ERROR_TYPE:
       return blink::WebServiceWorkerResponseTypeError;
     case CacheResponse::OPAQUE_TYPE:
       return blink::WebServiceWorkerResponseTypeOpaque;
+    case CacheResponse::OPAQUE_REDIRECT_TYPE:
+      return blink::WebServiceWorkerResponseTypeOpaqueRedirect;
   }
   NOTREACHED();
   return blink::WebServiceWorkerResponseTypeOpaque;
 }
 
 CacheResponse::ResponseType WebResponseTypeToProtoResponseType(
     blink::WebServiceWorkerResponseType response_type) {
   switch (response_type) {
     case blink::WebServiceWorkerResponseTypeBasic:
       return CacheResponse::BASIC_TYPE;
     case blink::WebServiceWorkerResponseTypeCORS:
       return CacheResponse::CORS_TYPE;
     case blink::WebServiceWorkerResponseTypeDefault:
       return CacheResponse::DEFAULT_TYPE;
     case blink::WebServiceWorkerResponseTypeError:
       return CacheResponse::ERROR_TYPE;
     case blink::WebServiceWorkerResponseTypeOpaque:
       return CacheResponse::OPAQUE_TYPE;
-    default:
-      // TODO(horo): Remove this when WebServiceWorkerResponseTypeOpaqueRedirect
-      // will be added in blink's WebServiceWorkerResponseType.h.
-      NOTREACHED();
+    case blink::WebServiceWorkerResponseTypeOpaqueRedirect:
+      return CacheResponse::OPAQUE_REDIRECT_TYPE;
   }
   NOTREACHED();
   return CacheResponse::OPAQUE_TYPE;
 }
 
 // Copy headers out of a cache entry and into a protobuf. The callback is
 // guaranteed to be run.
 void ReadMetadata(disk_cache::Entry* entry, const MetadataCallback& callback);
 void ReadMetadataDidReadMetadata(
     disk_cache::Entry* entry,
@@ skipping 961 matching lines @@
     CacheStorageError error,
     scoped_ptr<Requests> requests) {
   base::WeakPtr<CacheStorageCache> cache = weak_ptr_factory_.GetWeakPtr();
 
   callback.Run(error, requests.Pass());
   if (cache)
     scheduler_->CompleteOperationAndRunNext();
 }
 
 }  // namespace content