Service Worker: Improve some exception messages (Chromium).

content/browser/service_worker/service_worker_utils.cc

 // Copyright 2014 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_utils.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 
 namespace content {
 
 namespace {
 
-const char kDisallowedCharacterErrorMessage[] =
-    "The scope/script URL includes disallowed escaped character.";
-const char kPathRestrictionErrorMessage[] =
-    "The scope must be under the directory of the script URL.";
-
 bool ContainsDisallowedCharacter(const GURL& url) {
   std::string path = url.path();
   DCHECK(base::IsStringUTF8(path));
 
   // We should avoid these escaped characters in the path component because
   // these can be handled differently depending on server implementation.
   if (path.find("%2f") != std::string::npos ||
       path.find("%2F") != std::string::npos) {
     return true;
   }
@@ skipping 27 matching lines @@
     const GURL& script_url,
     std::string* error_message) {
   DCHECK(scope.is_valid());
   DCHECK(!scope.has_ref());
   DCHECK(script_url.is_valid());
   DCHECK(!script_url.has_ref());
   DCHECK(error_message);
 
   if (ContainsDisallowedCharacter(scope) ||
       ContainsDisallowedCharacter(script_url)) {
-    *error_message = kDisallowedCharacterErrorMessage;
+    *error_message = "The provided scope ('" + scope.spec() +
+                     "') or scriptURL ('" + script_url.spec() +

[dominicc (has gone to gerrit), 2015/01/14 06:16:38]

script URL

with a space? WDYT?

[dominicc (has gone to gerrit), 2015/01/14 06:16:38]

script URL

with a space? Ditto below. WDYT?

[dominicc (has gone to gerrit), 2015/01/14 06:16:38]

script URL

with a space? WDYT?

[falken, 2015/01/14 07:29:21]

I like "scriptURL" as it's the parameter to ServiceWorkerContainer.register().

+                     "') includes a disallowed escape character.";
     return false;
   }
 
   // |scope|'s path should be under the |script_url|'s directory.
   if (!StartsWithASCII(scope.path(), GetDirectoryPath(script_url), true)) {
-    *error_message = kPathRestrictionErrorMessage;
+    *error_message =
+        "The path of the provided scope ('" + scope.spec() +
+        "') is not under the directory of the provided scriptURL ('" +
+        script_url.spec() + "').";
     return false;
   }
   return true;
 }
 
 bool LongestScopeMatcher::MatchLongest(const GURL& scope) {
   if (!ServiceWorkerUtils::ScopeMatches(scope, url_))
     return false;
   if (match_.is_empty() || match_.spec().size() < scope.spec().size()) {
     match_ = scope;
     return true;
   }
   return false;
 }
 
 }  // namespace content