Remove WebURLError::Domain::kBlinkInternal

Bug: 748491
Change-Id: I5e86bf7a56def07546b17362f1e0c71395512b58
Reviewed-on: https://chromium-review.googlesource.com/577470
Commit-Queue: Yutaka Hirano <yhirano@chromium.org>
Reviewed-by: Takeshi Yoshino <tyoshino@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Bill Budge <bbudge@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490714}

components/nacl/renderer/file_downloader.cc

@@ -81,11 +81,11 @@ void FileDownloader::DidFail(const blink::WebURLError& error) {
         status_ = ACCESS_DENIED;
         break;
     }
-  } else {
-    // It's a WebKit error.
-    status_ = ACCESS_DENIED;
   }
 
+  if (error.is_web_security_violation)
+    status_ = ACCESS_DENIED;
+
   // Delete url_loader to prevent didFinishLoading from being called, which
   // some implementations of blink::WebURLLoader will do after calling didFail.
   url_loader_.reset();

content/renderer/pepper/pepper_url_loader_host.cc

@@ -186,10 +186,10 @@ void PepperURLLoaderHost::DidFail(const WebURLError& error) {
         pp_error = PP_ERROR_NOACCESS;
         break;
     }
-  } else {
-    // It's a WebKit error.
-    pp_error = PP_ERROR_NOACCESS;
   }
+
+  if (error.is_web_security_violation)
+    pp_error = PP_ERROR_NOACCESS;
   SendUpdateToPlugin(
       base::MakeUnique<PpapiPluginMsg_URLLoader_FinishedLoading>(pp_error));
 }

third_party/WebKit/LayoutTests/fast/workers/worker-crash-with-invalid-location-expected.txt

 Blocked access to external URL http://example.com/worker.js
+CONSOLE ERROR: line 18: Failed to start loading http://example.com/worker.js
 Test worker fetch of blocked url. Should print a "PASS" statement.
 
 PASS

third_party/WebKit/Source/core/exported/WebAssociatedURLLoaderImpl.cpp

@@ -420,8 +420,8 @@ void WebAssociatedURLLoaderImpl::LoadAsynchronously(
   }
 
   if (!loader_) {
-    // FIXME: return meaningful error codes.
-    client_adapter_->DidFail(ResourceError());
+    client_adapter_->DidFail(ResourceError::CancelledDueToAccessCheckError(
+        request.Url(), ResourceRequestBlockedReason::kOther));
   }
   client_adapter_->EnableErrorNotifications();
 }
@@ -467,7 +467,7 @@ void WebAssociatedURLLoaderImpl::DocumentDestroyed() {
   if (!client_)
     return;
 
-  ReleaseClient()->DidFail(ResourceError());
+  ReleaseClient()->DidFail(ResourceError::CancelledError(KURL()));
   // |this| may be dead here.
 }
 

third_party/WebKit/Source/core/html/parser/CSSPreloadScannerTest.cpp

@@ -142,7 +142,7 @@ TEST_F(CSSPreloadScannerTest, DontReadFromClearedData) {
 
   const char* data = "@import url('http://127.0.0.1/preload.css');";
   resource->AppendData(data, strlen(data));
-  ResourceError error(ResourceError::Domain::kBlinkInternal, 0, url, "");
+  ResourceError error(ResourceError::Domain::kTest, 0, url, "");
   resource->FinishAsError(error);
 
   // Should not crash.

third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

@@ -237,9 +237,14 @@ void DocumentThreadableLoader::Start(const ResourceRequest& request) {
                                                                  client_);
     ThreadableLoaderClient* client = client_;
     Clear();
-    client->DidFail(ResourceError(ResourceError::Domain::kBlinkInternal, 0,
-                                  request.Url(),
-                                  "Cross origin requests are not supported."));
+    ResourceError error = ResourceError::CancelledDueToAccessCheckError(
+        request.Url(), ResourceRequestBlockedReason::kOther,
+        "Cross origin requests are not supported.");
+    const String message = "Failed to load " + error.FailingURL() + ": " +
+                           error.LocalizedDescription();
+    loading_context_->GetExecutionContext()->AddConsoleMessage(
+        ConsoleMessage::Create(kJSMessageSource, kErrorMessageLevel, message));
+    client->DidFail(error);
     return;
   }
 
@@ -1106,8 +1111,11 @@ void DocumentThreadableLoader::LoadRequestAsync(
     // notified and |client| is null.
     if (!client)
       return;
-    client->DidFail(ResourceError(ResourceError::Domain::kBlinkInternal, 0,
-                                  request.Url(), "Failed to start loading."));
+    String message =
+        String("Failed to start loading ") + request.Url().GetString();
+    loading_context_->GetExecutionContext()->AddConsoleMessage(
+        ConsoleMessage::Create(kJSMessageSource, kErrorMessageLevel, message));
+    client->DidFail(ResourceError::CancelledError(request.Url()));
     return;
   }
 

third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp

@@ -648,10 +648,9 @@ TEST_P(ThreadableLoaderTest, DidFailInStart) {
   CreateLoader();
   CallCheckpoint(1);
 
-  EXPECT_CALL(*Client(),
-              DidFail(ResourceError(
-                  ResourceError::Domain::kBlinkInternal, 0, ErrorURL(),
-                  "Cross origin requests are not supported.")));
+  EXPECT_CALL(*Client(), DidFail(ResourceError::CancelledDueToAccessCheckError(
+                             ErrorURL(), ResourceRequestBlockedReason::kOther,
+                             "Cross origin requests are not supported.")));
   EXPECT_CALL(GetCheckpoint(), Call(2));
 
   StartLoader(ErrorURL(), WebURLRequest::kFetchRequestModeSameOrigin);

third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp

@@ -1569,12 +1569,6 @@ void XMLHttpRequest::DidFail(const ResourceError& error) {
     return;
   }
 
-  // Network failures are already reported to Web Inspector by ResourceLoader.
-  if (error.GetDomain() == ResourceError::Domain::kBlinkInternal)
-    LogConsoleError(GetExecutionContext(), "XMLHttpRequest cannot load " +
-                                               error.FailingURL() + ". " +
-                                               error.LocalizedDescription());
-
   HandleNetworkError();
 }
 

third_party/WebKit/Source/modules/fetch/FetchManager.cpp

@@ -518,12 +518,7 @@ void FetchManager::Loader::DidFinishLoading(unsigned long, double) {
 }
 
 void FetchManager::Loader::DidFail(const ResourceError& error) {
-  if (error.IsCancellation() || error.IsTimeout() ||
-      error.GetDomain() != ResourceError::Domain::kBlinkInternal)
-    Failed(String());
-  else
-    Failed("Fetch API cannot load " + error.FailingURL() + ". " +
-           error.LocalizedDescription());
+  Failed(String());
 }
 
 void FetchManager::Loader::DidFailRedirectCheck() {

third_party/WebKit/Source/platform/exported/WebURLError.cpp

@@ -81,9 +81,6 @@ std::ostream& operator<<(std::ostream& out, const WebURLError::Domain domain) {
     case WebURLError::Domain::kNet:
       out << "net";
       break;
-    case WebURLError::Domain::kBlinkInternal:
-      out << "blink";
-      break;
     case WebURLError::Domain::kHttp:
       out << "http";
       break;

third_party/WebKit/public/platform/WebURLError.h

@@ -51,8 +51,6 @@ struct WebURLError {
     // net/base/net_error_list.h.
     kNet,
 
-    kBlinkInternal,
-
     // |reason| is an HTTP status code.
     kHttp,