ServiceWorker: Change worker script fetch error code.

Change worker script fetch error code in "Update" algorithm to align
with spec:
Non 2xx response will be rejected with NetworkError;
Redirected response will be rejected with SecurityError;
Reponse with Wrong MIME type will be rejected with SecurityError.

(1/3): https://codereview.chromium.org/546353003/
(2/3): this
(3/3): Layout test & Blink side cleanup

BUG=408421
TEST=http/tests/serviceworker

Review URL: https://codereview.chromium.org/567903002

Cr-Commit-Position: refs/heads/master@{#295940}

content/browser/service_worker/service_worker_job_unittest.cc

@@ -945,7 +945,8 @@ class UpdateJobTestHelper
       int64 resource_id = storage()->NewResourceId();
       version->script_cache_map()->NotifyStartedCaching(script, resource_id);
       WriteStringResponse(storage(), resource_id, kMockScriptBody);
-      version->script_cache_map()->NotifyFinishedCaching(script, true);
+      version->script_cache_map()->NotifyFinishedCaching(
+          script, net::URLRequestStatus());
     } else {
       // Spoof caching the script for the new version.
       int64 resource_id = storage()->NewResourceId();
@@ -954,7 +955,8 @@ class UpdateJobTestHelper
         WriteStringResponse(storage(), resource_id, kMockScriptBody);
       else
         WriteStringResponse(storage(), resource_id, "mock_different_script");
-      version->script_cache_map()->NotifyFinishedCaching(script, true);
+      version->script_cache_map()->NotifyFinishedCaching(
+          script, net::URLRequestStatus());
     }
     EmbeddedWorkerTestHelper::OnStartWorker(
         embedded_worker_id, version_id, scope, script, pause_after_download);

content/browser/service_worker/service_worker_register_job.cc

@@ -12,6 +12,7 @@
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/browser/service_worker/service_worker_storage.h"
 #include "content/browser/service_worker/service_worker_utils.h"
+#include "net/base/net_errors.h"
 
 namespace content {
 
@@ -333,14 +334,33 @@ void ServiceWorkerRegisterJob::UpdateAndContinue() {
 
 void ServiceWorkerRegisterJob::OnStartWorkerFinished(
     ServiceWorkerStatusCode status) {
-  // "If serviceWorker fails to start up..." then reject the promise with an
-  // error and abort.
-  if (status != SERVICE_WORKER_OK) {
-    Complete(status);
+  if (status == SERVICE_WORKER_OK) {
+    InstallAndContinue();
     return;
   }
 
-  InstallAndContinue();
+  // "If serviceWorker fails to start up..." then reject the promise with an
+  // error and abort. When there is a main script network error, the status will
+  // be updated to a more specific one.
+  const net::URLRequestStatus& main_script_status =
+      new_version()->script_cache_map()->main_script_status();
+  if (main_script_status.status() != net::URLRequestStatus::SUCCESS) {
+    switch (main_script_status.error()) {
+      case net::ERR_INSECURE_RESPONSE:
+      case net::ERR_UNSAFE_REDIRECT:
+        status = SERVICE_WORKER_ERROR_SECURITY;
+        break;
+      case net::ERR_ABORTED:
+        status = SERVICE_WORKER_ERROR_ABORT;
+        break;
+      case net::ERR_FAILED:
+        status = SERVICE_WORKER_ERROR_NETWORK;
+        break;
+      default:
+        NOTREACHED();
+    }
+  }
+  Complete(status);
 }
 
 // This function corresponds to the spec's [[Install]] algorithm.

content/browser/service_worker/service_worker_registration_status.cc

@@ -35,6 +35,14 @@ void GetServiceWorkerRegistrationStatusResponse(
       *error_type = WebServiceWorkerError::ErrorTypeNotFound;
       return;
 
+    case SERVICE_WORKER_ERROR_NETWORK:
+      *error_type = WebServiceWorkerError::ErrorTypeNetwork;
+      return;
+
+    case SERVICE_WORKER_ERROR_SECURITY:
+      *error_type = WebServiceWorkerError::ErrorTypeSecurity;
+      return;
+
     case SERVICE_WORKER_ERROR_ABORT:
     case SERVICE_WORKER_ERROR_IPC_FAILED:
     case SERVICE_WORKER_ERROR_FAILED:

content/browser/service_worker/service_worker_script_cache_map.cc

@@ -16,8 +16,7 @@ ServiceWorkerScriptCacheMap::ServiceWorkerScriptCacheMap(
     ServiceWorkerVersion* owner,
     base::WeakPtr<ServiceWorkerContextCore> context)
     : owner_(owner),
-      context_(context),
-      has_error_(false) {
+      context_(context) {
 }
 
 ServiceWorkerScriptCacheMap::~ServiceWorkerScriptCacheMap() {
@@ -40,14 +39,15 @@ void ServiceWorkerScriptCacheMap::NotifyStartedCaching(
 }
 
 void ServiceWorkerScriptCacheMap::NotifyFinishedCaching(
-    const GURL& url, bool success) {
+    const GURL& url, const net::URLRequestStatus& status) {
   DCHECK_NE(kInvalidServiceWorkerResponseId, Lookup(url));
   DCHECK(owner_->status() == ServiceWorkerVersion::NEW ||
          owner_->status() == ServiceWorkerVersion::INSTALLING);
-  if (!success) {
+  if (!status.is_success()) {
     context_->storage()->DoomUncommittedResponse(Lookup(url));
-    has_error_ = true;
     resource_ids_.erase(url);
+    if (owner_->script_url() == url)
+      main_script_status_ = status;
   }
 }
 

content/browser/service_worker/service_worker_script_cache_map.h

@@ -12,6 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "content/browser/service_worker/service_worker_database.h"
 #include "content/common/content_export.h"
+#include "net/url_request/url_request_status.h"
 
 class GURL;
 
@@ -29,10 +30,10 @@ class CONTENT_EXPORT ServiceWorkerScriptCacheMap {
   // Used during the initial run of a new version to build the map
   // of resources ids.
   void NotifyStartedCaching(const GURL& url, int64 resource_id);
-  void NotifyFinishedCaching(const GURL& url, bool success);
+  void NotifyFinishedCaching(const GURL& url,
+                             const net::URLRequestStatus& status);
 
   // Used to retrieve the results of the initial run of a new version.
-  bool HasError() const { return has_error_; }
   void GetResources(
       std::vector<ServiceWorkerDatabase::ResourceRecord>* resources);
 
@@ -42,6 +43,10 @@ class CONTENT_EXPORT ServiceWorkerScriptCacheMap {
 
   size_t size() const { return resource_ids_.size(); }
 
+  const net::URLRequestStatus& main_script_status() const {
+    return main_script_status_;
+  }
+
  private:
   typedef std::map<GURL, int64> ResourceIDMap;
 
@@ -55,7 +60,7 @@ class CONTENT_EXPORT ServiceWorkerScriptCacheMap {
   ServiceWorkerVersion* owner_;
   base::WeakPtr<ServiceWorkerContextCore> context_;
   ResourceIDMap resource_ids_;
-  bool has_error_;
+  net::URLRequestStatus main_script_status_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerScriptCacheMap);
 };

content/browser/service_worker/service_worker_write_to_cache_job.cc

@@ -68,7 +68,8 @@ void ServiceWorkerWriteToCacheJob::Kill() {
   net_request_.reset();
   if (did_notify_started_ && !did_notify_finished_) {
     version_->script_cache_map()->NotifyFinishedCaching(
-        url_, false);
+        url_,
+        net::URLRequestStatus(net::URLRequestStatus::FAILED, net::ERR_ABORTED));
     did_notify_finished_ = true;
   }
   writer_.reset();
@@ -128,7 +129,7 @@ bool ServiceWorkerWriteToCacheJob::ReadRawData(
   // No more data to process, the job is complete.
   io_buffer_ = NULL;
   version_->script_cache_map()->NotifyFinishedCaching(
-      url_, status.is_success());
+      url_, net::URLRequestStatus());
   did_notify_finished_ = true;
   return status.is_success();
 }
@@ -279,7 +280,7 @@ void ServiceWorkerWriteToCacheJob::OnReceivedRedirect(
                "ServiceWorkerWriteToCacheJob::OnReceivedRedirect");
   // Script resources can't redirect.
   AsyncNotifyDoneHelper(net::URLRequestStatus(
-      net::URLRequestStatus::FAILED, net::ERR_FAILED));
+      net::URLRequestStatus::FAILED, net::ERR_UNSAFE_REDIRECT));
 }
 
 void ServiceWorkerWriteToCacheJob::OnAuthRequired(
@@ -349,7 +350,7 @@ void ServiceWorkerWriteToCacheJob::OnResponseStarted(
         mime_type != "text/javascript" &&
         mime_type != "application/javascript") {
       AsyncNotifyDoneHelper(net::URLRequestStatus(
-          net::URLRequestStatus::FAILED, net::ERR_FAILED));
+          net::URLRequestStatus::FAILED, net::ERR_INSECURE_RESPONSE));
       return;
     }
   }
@@ -380,8 +381,7 @@ void ServiceWorkerWriteToCacheJob::OnReadCompleted(
 void ServiceWorkerWriteToCacheJob::AsyncNotifyDoneHelper(
     const net::URLRequestStatus& status) {
   DCHECK(!status.is_io_pending());
-  version_->script_cache_map()->NotifyFinishedCaching(
-      url_, status.is_success());
+  version_->script_cache_map()->NotifyFinishedCaching(url_, status);
   did_notify_finished_ = true;
   SetStatus(status);
   NotifyDone(status);

content/common/service_worker/service_worker_status_code.cc

@@ -30,6 +30,10 @@ const char* ServiceWorkerStatusToString(ServiceWorkerStatusCode status) {
       return "ServiceWorker failed to activate";
     case SERVICE_WORKER_ERROR_IPC_FAILED:
       return "IPC connection was closed or IPC error has occured";
+    case SERVICE_WORKER_ERROR_NETWORK:
+      return "Operation failed by network issue";
+    case SERVICE_WORKER_ERROR_SECURITY:
+      return "Operation failed by security issue";
   }
   NOTREACHED();
   return "";

content/common/service_worker/service_worker_status_code.h

@@ -42,6 +42,12 @@ enum ServiceWorkerStatusCode {
   // Sending an IPC to the worker failed (often due to child process is
   // terminated).
   SERVICE_WORKER_ERROR_IPC_FAILED,
+
+  // Operation is failed by network issue.
+  SERVICE_WORKER_ERROR_NETWORK,
+
+  // Operation is failed by security issue.
+  SERVICE_WORKER_ERROR_SECURITY,
 };
 
 CONTENT_EXPORT const char* ServiceWorkerStatusToString(