Service worker registration error support

content/browser/service_worker/service_worker_dispatcher_host.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_dispatcher_host.h"
 
+#include "base/strings/utf_string_conversions.h"
 #include "content/browser/service_worker/service_worker_context.h"
 #include "content/common/service_worker_messages.h"
 #include "ipc/ipc_message_macros.h"
+#include "third_party/WebKit/public/platform/WebServiceWorkerError.h"
 #include "url/gurl.h"
 
+using WebKit::WebServiceWorkerError;
+
 namespace content {
 
 ServiceWorkerDispatcherHost::ServiceWorkerDispatcherHost(
     int render_process_id,
     ServiceWorkerContext* context)
     : render_process_id_(render_process_id), context_(context) {}
 
 ServiceWorkerDispatcherHost::~ServiceWorkerDispatcherHost() {}
 
 bool ServiceWorkerDispatcherHost::OnMessageReceived(const IPC::Message& message,
@@ skipping 24 matching lines @@
 void ServiceWorkerDispatcherHost::OnRegisterServiceWorker(
     int32 thread_id,
     int32 request_id,
     const GURL& scope,
     const GURL& script_url) {
   // TODO(alecflett): add a ServiceWorker-specific policy query in
   // ChildProcessSecurityImpl. See http://crbug.com/311631.
 
   // TODO(alecflett): Throw an error for origin mismatch, rather than
   // just returning.
   if (scope.GetOrigin() != script_url.GetOrigin())

[michaeln, 2013/10/25 21:41:25]

this can use the error return path now and probably should come after the
enabled check

[michaeln, 2013/10/26 00:57:39]

was wondering what happened to this one... i guess there is no value for
SecurityError defined yet, a generic Error value might help while we're fleshing
out the what errors we want specific values for... wdyt?

in any case, putting the enabled test up top seems like a good idea 

[alecflett, 2013/10/28 17:03:14]

oops, just an oversight. Done. (Add added a fairly generic "SecurityError" to
the WebKit side)

     return;
 
+  if (!context_->enabled()) {
+    Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
+        thread_id,
+        request_id,
+        WebKit::WebServiceWorkerError::DisabledError,
+        ASCIIToUTF16("ServiceWorker is disabled")));
+    return;
+  }
+
   Send(new ServiceWorkerMsg_ServiceWorkerRegistered(
       thread_id, request_id, NextWorkerId()));
 }
 
 void ServiceWorkerDispatcherHost::OnUnregisterServiceWorker(int32 thread_id,
                                                             int32 request_id,
                                                             const GURL& scope) {
   // TODO(alecflett): add a ServiceWorker-specific policy query in
   // ChildProcessSecurityImpl. See http://crbug.com/311631.
 
+  if (!context_->enabled()) {
+    Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
+        thread_id,
+        request_id,
+        WebServiceWorkerError::DisabledError,
+        ASCIIToUTF16("ServiceWorker is disabled")));
+    return;
+  }
+
   Send(new ServiceWorkerMsg_ServiceWorkerUnregistered(
       thread_id, request_id));
 }
 
 }  // namespace content