Service Worker: Use more specific errors when StartWorker fails

content/browser/service_worker/service_worker_register_job.cc

 // Copyright 2013 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/service_worker/service_worker_register_job.h"
 
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
@@ skipping 315 matching lines @@
 }
 
 void ServiceWorkerRegisterJob::OnStartWorkerFinished(
     ServiceWorkerStatusCode status) {
   if (status == SERVICE_WORKER_OK) {
     InstallAndContinue();
     return;
   }
 
   // "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.
+  // error and abort.
+  if (status == SERVICE_WORKER_ERROR_TIMEOUT) {
+    Complete(status, "Timed out while trying to start the Service Worker.");
+    return;
+  }
+
   const net::URLRequestStatus& main_script_status =
       new_version()->script_cache_map()->main_script_status();
   std::string message;
   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;
-      default:
-        status = SERVICE_WORKER_ERROR_NETWORK;
-    }
     message = new_version()->script_cache_map()->main_script_status_message();
     if (message.empty())
       message = kFetchScriptError;
   }
-
-  if (status == SERVICE_WORKER_ERROR_TIMEOUT)
-    message = "Timed out while trying to start the Service Worker.";
-
   Complete(status, message);
 }
 
 // This function corresponds to the spec's [[Install]] algorithm.
 void ServiceWorkerRegisterJob::InstallAndContinue() {
   SetPhase(INSTALL);
 
   // "Set registration.installingWorker to worker."
   DCHECK(!registration()->installing_version());
   registration()->SetInstallingVersion(new_version());
@@ skipping 189 matching lines @@
     if (host->IsHostToRunningServiceWorker())
       continue;
     if (!ServiceWorkerUtils::ScopeMatches(registration->pattern(),
                                           host->document_url()))
       continue;
     host->AddMatchingRegistration(registration);
   }
 }
 
 }  // namespace content