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

content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc

Index: content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc b/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc
index 8a5c76a6f2f2fbf6d941d70b44afd0076775a5c6..8ea08a3882079e61da792cacf9c99930066256c2 100644
--- a/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc
+++ b/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc
@@ -123,14 +123,11 @@ TEST_F(ServiceWorkerControlleeRequestHandlerTest, DisallowServiceWorker) {
       kDocUrl, net::DEFAULT_PRIORITY, &url_request_delegate_);
   scoped_ptr<ServiceWorkerControlleeRequestHandler> handler(
       new ServiceWorkerControlleeRequestHandler(
-          context()->AsWeakPtr(),
-          provider_host_,
+          context()->AsWeakPtr(), provider_host_,
           base::WeakPtr<storage::BlobStorageContext>(),
-          FETCH_REQUEST_MODE_NO_CORS,
-          FETCH_CREDENTIALS_MODE_OMIT,
-          RESOURCE_TYPE_MAIN_FRAME,
-          REQUEST_CONTEXT_TYPE_HYPERLINK,
-          REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL,
+          FETCH_REQUEST_MODE_NO_CORS, FETCH_CREDENTIALS_MODE_OMIT,
+          FETCH_REDIRECT_MODE_FOLLOW, RESOURCE_TYPE_MAIN_FRAME,
+          REQUEST_CONTEXT_TYPE_HYPERLINK, REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL,
           scoped_refptr<ResourceRequestBody>()));
   scoped_refptr<net::URLRequestJob> job =
       handler->MaybeCreateJob(request.get(), NULL, &mock_resource_context_);
@@ -166,14 +163,11 @@ TEST_F(ServiceWorkerControlleeRequestHandlerTest, ActivateWaitingVersion) {
       kDocUrl, net::DEFAULT_PRIORITY, &url_request_delegate_);
   scoped_ptr<ServiceWorkerControlleeRequestHandler> handler(
       new ServiceWorkerControlleeRequestHandler(
-          context()->AsWeakPtr(),
-          provider_host_,
+          context()->AsWeakPtr(), provider_host_,
           base::WeakPtr<storage::BlobStorageContext>(),
-          FETCH_REQUEST_MODE_NO_CORS,
-          FETCH_CREDENTIALS_MODE_OMIT,
-          RESOURCE_TYPE_MAIN_FRAME,
-          REQUEST_CONTEXT_TYPE_HYPERLINK,
-          REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL,
+          FETCH_REQUEST_MODE_NO_CORS, FETCH_CREDENTIALS_MODE_OMIT,
+          FETCH_REDIRECT_MODE_FOLLOW, RESOURCE_TYPE_MAIN_FRAME,
+          REQUEST_CONTEXT_TYPE_HYPERLINK, REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL,
           scoped_refptr<ResourceRequestBody>()));
   scoped_refptr<net::URLRequestJob> job =
       handler->MaybeCreateJob(request.get(), NULL, &mock_resource_context_);
@@ -217,14 +211,11 @@ TEST_F(ServiceWorkerControlleeRequestHandlerTest, DeletedProviderHost) {
       kDocUrl, net::DEFAULT_PRIORITY, &url_request_delegate_);
   scoped_ptr<ServiceWorkerControlleeRequestHandler> handler(
       new ServiceWorkerControlleeRequestHandler(
-          context()->AsWeakPtr(),
-          provider_host_,
+          context()->AsWeakPtr(), provider_host_,
           base::WeakPtr<storage::BlobStorageContext>(),
-          FETCH_REQUEST_MODE_NO_CORS,
-          FETCH_CREDENTIALS_MODE_OMIT,
-          RESOURCE_TYPE_MAIN_FRAME,
-          REQUEST_CONTEXT_TYPE_HYPERLINK,
-          REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL,
+          FETCH_REQUEST_MODE_NO_CORS, FETCH_CREDENTIALS_MODE_OMIT,
+          FETCH_REDIRECT_MODE_FOLLOW, RESOURCE_TYPE_MAIN_FRAME,
+          REQUEST_CONTEXT_TYPE_HYPERLINK, REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL,
           scoped_refptr<ResourceRequestBody>()));
   scoped_refptr<net::URLRequestJob> job =
       handler->MaybeCreateJob(request.get(), NULL, &mock_resource_context_);