Service Worker: Improve some exception messages (Chromium).

content/child/service_worker/service_worker_dispatcher.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/child/service_worker/service_worker_dispatcher.h"
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
 #include "content/child/child_thread.h"
 #include "content/child/service_worker/service_worker_handle_reference.h"
 #include "content/child/service_worker/service_worker_provider_context.h"
 #include "content/child/service_worker/service_worker_registration_handle_reference.h"
 #include "content/child/service_worker/web_service_worker_impl.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/service_worker/service_worker_messages.h"
+#include "content/common/service_worker/service_worker_types.h"
 #include "content/public/common/url_utils.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerClientsInfo.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerProviderClient.h"
+#include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 
 using blink::WebServiceWorkerError;
 using blink::WebServiceWorkerProvider;
 using base::ThreadLocalPointer;
 
 namespace content {
 
 namespace {
 
@@ skipping 62 matching lines @@
     int provider_id,
     const GURL& pattern,
     const GURL& script_url,
     WebServiceWorkerRegistrationCallbacks* callbacks) {
   DCHECK(callbacks);
 
   if (pattern.possibly_invalid_spec().size() > GetMaxURLChars() ||
       script_url.possibly_invalid_spec().size() > GetMaxURLChars()) {
     scoped_ptr<WebServiceWorkerRegistrationCallbacks>
         owned_callbacks(callbacks);
-    scoped_ptr<WebServiceWorkerError> error(new WebServiceWorkerError(
-        WebServiceWorkerError::ErrorTypeSecurity, "URL too long"));
+    std::string error_message(kServiceWorkerRegisterErrorPrefix);
+    error_message += "The provided scriptURL or scope is too long.";
+    scoped_ptr<WebServiceWorkerError> error(
+        new WebServiceWorkerError(WebServiceWorkerError::ErrorTypeSecurity,
+                                  blink::WebString::fromUTF8(error_message)));
     callbacks->onError(error.release());
     return;
   }
 
   int request_id = pending_registration_callbacks_.Add(callbacks);
   TRACE_EVENT_ASYNC_BEGIN2("ServiceWorker",
                            "ServiceWorkerDispatcher::RegisterServiceWorker",
                            request_id,
                            "Scope", pattern.spec(),
                            "Script URL", script_url.spec());
   thread_safe_sender_->Send(new ServiceWorkerHostMsg_RegisterServiceWorker(
       CurrentWorkerId(), request_id, provider_id, pattern, script_url));
 }
 
 void ServiceWorkerDispatcher::UnregisterServiceWorker(
     int provider_id,
     const GURL& pattern,
     WebServiceWorkerUnregistrationCallbacks* callbacks) {
   DCHECK(callbacks);
 
   if (pattern.possibly_invalid_spec().size() > GetMaxURLChars()) {
     scoped_ptr<WebServiceWorkerUnregistrationCallbacks>
         owned_callbacks(callbacks);
-    scoped_ptr<WebServiceWorkerError> error(new WebServiceWorkerError(
-        WebServiceWorkerError::ErrorTypeSecurity, "URL too long"));
+    std::string error_message(kServiceWorkerUnregisterErrorPrefix);
+    error_message += "The provided scope is too long.";
+    scoped_ptr<WebServiceWorkerError> error(
+        new WebServiceWorkerError(WebServiceWorkerError::ErrorTypeSecurity,
+                                  blink::WebString::fromUTF8(error_message)));
     callbacks->onError(error.release());
     return;
   }
 
   int request_id = pending_unregistration_callbacks_.Add(callbacks);
   TRACE_EVENT_ASYNC_BEGIN1("ServiceWorker",
                            "ServiceWorkerDispatcher::UnregisterServiceWorker",
                            request_id,
                            "Scope", pattern.spec());
   thread_safe_sender_->Send(new ServiceWorkerHostMsg_UnregisterServiceWorker(
       CurrentWorkerId(), request_id, provider_id, pattern));
 }
 
 void ServiceWorkerDispatcher::GetRegistration(
     int provider_id,
     const GURL& document_url,
     WebServiceWorkerRegistrationCallbacks* callbacks) {
   DCHECK(callbacks);
 
   if (document_url.possibly_invalid_spec().size() > GetMaxURLChars()) {
     scoped_ptr<WebServiceWorkerRegistrationCallbacks>
         owned_callbacks(callbacks);
-    scoped_ptr<WebServiceWorkerError> error(new WebServiceWorkerError(
-        WebServiceWorkerError::ErrorTypeSecurity, "URL too long"));
+    std::string error_message(kServiceWorkerGetRegistrationErrorPrefix);
+    error_message += "The provided documentURL is too long.";
+    scoped_ptr<WebServiceWorkerError> error(
+        new WebServiceWorkerError(WebServiceWorkerError::ErrorTypeSecurity,
+                                  blink::WebString::fromUTF8(error_message)));
     callbacks->onError(error.release());
     return;
   }
 
   int request_id = pending_get_registration_callbacks_.Add(callbacks);
   TRACE_EVENT_ASYNC_BEGIN1("ServiceWorker",
                            "ServiceWorkerDispatcher::GetRegistration",
                            request_id,
                            "Document URL", document_url.spec());
   thread_safe_sender_->Send(new ServiceWorkerHostMsg_GetRegistration(
@@ skipping 570 matching lines @@
         attrs.installing, thread_safe_sender_.get());
     ServiceWorkerHandleReference::Adopt(
         attrs.waiting, thread_safe_sender_.get());
     ServiceWorkerHandleReference::Adopt(
         attrs.active, thread_safe_sender_.get());
   }
   return registration;
 }
 
 }  // namespace content