Updated error translation logic.

ios/web/web_state/ui/crw_ui_web_view_web_controller.mm

 // 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.
 
 #import "ios/web/web_state/ui/crw_ui_web_view_web_controller.h"
 
+#import "base/ios/ns_error_util.h"
 #import "base/ios/weak_nsobject.h"
 #include "base/json/json_reader.h"
 #include "base/json/string_escape.h"
 #include "base/mac/bind_objc_block.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 11 matching lines @@
 #import "ios/web/ui_web_view_util.h"
 #include "ios/web/web_state/frame_info.h"
 #import "ios/web/web_state/js/crw_js_invoke_parameter_queue.h"
 #import "ios/web/web_state/ui/crw_context_menu_provider.h"
 #import "ios/web/web_state/ui/crw_web_controller+protected.h"
 #import "ios/web/web_state/ui/crw_web_controller.h"
 #import "ios/web/web_state/ui/web_view_js_utils.h"
 #import "ios/web/web_state/web_state_impl.h"
 #import "ios/web/web_state/web_view_internal_creation_util.h"
 #import "net/base/mac/url_conversions.h"
+#include "net/base/net_errors.h"
 #include "url/url_constants.h"
 
 namespace web {
 
 // The following continuous check timer frequency constants are externally
 // available for the purpose of performance tests.
 // Frequency for the continuous checks when a reset in the page object is
 // anticipated shortly. In milliseconds.
 const int64 kContinuousCheckIntervalMSHigh = 100;
 
@@ skipping 749 matching lines @@
                           ? zoomState.zoom_scale()
                           : self.webScrollView.minimumZoomScale /
                                 zoomState.minimum_zoom_scale();
   if (zoomScale < self.webScrollView.minimumZoomScale)
     zoomScale = self.webScrollView.minimumZoomScale;
   if (zoomScale > self.webScrollView.maximumZoomScale)
     zoomScale = self.webScrollView.maximumZoomScale;
   self.webScrollView.zoomScale = zoomScale;
 }
 
--(BOOL)shouldAbortLoadForCancelledURL:(const GURL&)cancelledURL {
-  return YES;
+- (BOOL)shouldAbortLoadForCancelledError:(NSError*)cancelledError {
+  // NSURLErrorCancelled errors generated by the Chrome net stack should be
+  // aborted.  If the error was generated by the UIWebView, it will not have
+  // an underlying net error and will be automatically retried by the web view.
+  DCHECK_EQ(cancelledError.code, NSURLErrorCancelled);
+  NSError* underlyingError =
+      base::ios::GetFinalUnderlyingErrorFromError(cancelledError);
+  NSString* netDomain = base::SysUTF8ToNSString(net::kErrorDomain);
+  return [underlyingError.domain isEqualToString:netDomain];
 }
 
 #pragma mark - JS to ObjC messaging
 
 - (void)respondToJSInvoke {
   // This call is asynchronous. If the web view has been removed, there is
   // nothing left to do, so just discard the queued messages and return.
   if (!self.webView) {
     _jsInvokeParameterQueue.reset([[CRWJSInvokeParameterQueue alloc] init]);
     return;
@@ skipping 662 matching lines @@
 }
 
 #pragma mark -
 #pragma mark Testing methods
 
 -(id<CRWRecurringTaskDelegate>)recurringTaskDelegate {
   return _recurringTaskDelegate;
 }
 
 @end