<webview>: Add better loadabort reason messages

content/browser/browser_plugin/browser_plugin_guest.cc

 // Copyright (c) 2012 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/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
@@ skipping 293 matching lines @@
 
   int render_process_id = render_view_host->GetProcess()->GetID();
   GlobalRequestID global_id(render_process_id, url_request_id);
   net::URLRequest* url_request =
       ResourceDispatcherHostImpl::Get()->GetURLRequest(global_id);
   if (url_request)
     return url_request->url().possibly_invalid_spec();
   return "";
 }
 
+bool SupportsScheme(const GURL& url) {
+  // javascript: URLs are not supported.
+  if (url.SchemeIs(kJavaScriptScheme))
+    return false;
+
+  ChildProcessSecurityPolicyImpl* policy =
+      ChildProcessSecurityPolicyImpl::GetInstance();
+  if (policy->IsWebSafeScheme(url.scheme()) ||
+      policy->IsPseudoScheme(url.scheme())) {
+    return true;
+  }
+
+  return false;
+}
+
 }  // namespace
 
 class BrowserPluginGuest::EmbedderWebContentsObserver
     : public WebContentsObserver {
  public:
   explicit EmbedderWebContentsObserver(BrowserPluginGuest* guest)
       : WebContentsObserver(guest->embedder_web_contents()),
         browser_plugin_guest_(guest) {
   }
 
@@ skipping 71 matching lines @@
   // Clean up unattached new windows opened by this guest.
   for (PendingWindowMap::const_iterator it = pending_new_windows.begin();
        it != pending_new_windows.end(); ++it) {
     it->first->Destroy();
   }
   // All pending windows should be removed from the set after Destroy() is
   // called on all of them.
   DCHECK(pending_new_windows_.empty());
 }
 
+void BrowserPluginGuest::ReportLoadAbort(const GURL& url,
+                                         bool is_top_level,
+                                         int reason) {
+  if (!delegate_)
+    return;
+
+  std::string error_type;
+  base::RemoveChars(net::ErrorToString(reason), "net::",
+                    &error_type);
+  delegate_->LoadAbort(is_top_level, url, error_type);
+}
+
 void BrowserPluginGuest::LoadURLWithParams(const GURL& url,
                                            const Referrer& referrer,
                                            PageTransition transition_type,
                                            WebContents* web_contents) {
+  // If the URL is invalid, then there's nothing to do here except abort.
+  if (!url.is_valid()) {
+    ReportLoadAbort(url, true /* is_top_level */, net::ERR_INVALID_URL);
+    return;
+  }
+
   // Do not allow navigating a guest to schemes other than known safe schemes.
   // This will block the embedder trying to load unwanted schemes, e.g.
   // chrome://settings.
-  bool scheme_is_blocked =
-      (!ChildProcessSecurityPolicyImpl::GetInstance()->IsWebSafeScheme(
-          url.scheme()) &&
-      !ChildProcessSecurityPolicyImpl::GetInstance()->IsPseudoScheme(
-          url.scheme())) ||
-      url.SchemeIs(kJavaScriptScheme);
-  bool can_commit =
-      GetContentClient()->browser()->CanCommitURL(
-          GetWebContents()->GetRenderProcessHost(), url);
-  if (scheme_is_blocked || !url.is_valid() || !can_commit) {
-    if (delegate_) {
-      // TODO(fsamuel): Need better error reporting here.
-      std::string error_type;
-      base::RemoveChars(net::ErrorToString(net::ERR_ABORTED), "net::",
-                        &error_type);
-      delegate_->LoadAbort(true /* is_top_level */, url, error_type);
-    }
+  if (!SupportsScheme(url)) {
+    ReportLoadAbort(url, true /* is_top_level */,
+                    net::ERR_DISALLOWED_URL_SCHEME);
     return;
   }
 
+  if (!GetContentClient()->browser()->CanCommitURL(
+      GetWebContents()->GetRenderProcessHost(), url)) {
+    ReportLoadAbort(url, true /* is_top_level */, net::ERR_ACCESS_DENIED);
+    return;
+  }
+
   GURL validated_url(url);
   GetWebContents()->GetRenderProcessHost()->FilterURL(false, &validated_url);
 
   NavigationController::LoadURLParams load_url_params(validated_url);
   load_url_params.referrer = referrer;
   load_url_params.transition_type = transition_type;
   load_url_params.extra_headers = std::string();
   if (delegate_ && delegate_->IsOverridingUserAgent()) {
     load_url_params.override_user_agent =
         NavigationController::UA_OVERRIDE_TRUE;
@@ skipping 1441 matching lines @@
                    base::Value::CreateStringValue(request_method));
   request_info.Set(browser_plugin::kURL, base::Value::CreateStringValue(url));
 
   RequestPermission(BROWSER_PLUGIN_PERMISSION_TYPE_DOWNLOAD,
                     new DownloadRequest(weak_ptr_factory_.GetWeakPtr(),
                                         callback),
                     request_info);
 }
 
 }  // namespace content