Updated error translation logic.

ios/web/web_state/ui/crw_wk_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_wk_web_view_web_controller.h"
 
 #import <WebKit/WebKit.h>
 
 #include "base/ios/weak_nsobject.h"
 #include "base/json/json_reader.h"
@@ skipping 33 matching lines @@
 
 namespace {
 // Extracts Referer value from WKNavigationAction request header.
 NSString* GetRefererFromNavigationAction(WKNavigationAction* action) {
   return [action.request valueForHTTPHeaderField:@"Referer"];
 }
 
 NSString* const kScriptMessageName = @"crwebinvoke";
 NSString* const kScriptImmediateName = @"crwebinvokeimmediate";
 
+// Utility functions for storing the source of NSErrors received by WKWebViews:
+// - Errors received by |-webView:didFailProvisionalNavigation:withError:| are
+//   recorded using WKWebViewErrorSource::PROVISIONAL_LOAD.  These should be
+//   aborted.
+// - Errors received by |-webView:didFailNavigation:withError:| are recorded
+//   using WKWebViewsource::NAVIGATION.  These errors should not be aborted, as
+//   the WKWebView will automatically retry the load.
+NSString* const kWKWebViewErrorSourceKey = @"ErrorSource";
+typedef enum { NONE = 0, PROVISIONAL_LOAD, NAVIGATION } WKWebViewErrorSource;
+NSError* WKWebViewErrorWithSource(NSError* error, WKWebViewErrorSource source) {
+  DCHECK(error);
+  base::scoped_nsobject<NSMutableDictionary> userInfo(
+      [error.userInfo mutableCopy]);
+  [userInfo setValue:@(source) forKey:kWKWebViewErrorSourceKey];

[Eugene But (OOO till 7-30), 2015/06/23 21:27:14]

s/setValue/setObject

[kkhorimoto, 2015/06/24 20:01:42]

Done.

+  return [NSError errorWithDomain:error.domain
+                             code:error.code
+                         userInfo:userInfo];
+}
+WKWebViewErrorSource WKWebViewErrorSourceFromError(NSError* error) {
+  DCHECK(error);
+  return static_cast<WKWebViewErrorSource>(
+      [error.userInfo[kWKWebViewErrorSourceKey] integerValue]);
+}
+
 }  // namespace
 
 @interface CRWWKWebViewWebController () <WKNavigationDelegate,
                                          WKScriptMessageHandler,
                                          WKUIDelegate> {
   // The WKWebView managed by this instance.
   base::scoped_nsobject<WKWebView> _wkWebView;
 
   // The Watch Dog that detects and reports WKWebView crashes.
   base::scoped_nsobject<CRWWKWebViewCrashDetector> _crashDetector;
@@ skipping 341 matching lines @@
   if (zoomState.IsLegacyFormat())
     return;
   CGFloat zoomScale = zoomState.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 {
+- (BOOL)shouldAbortLoadForCancelledError:(NSError*)cancelledError {
+  DCHECK_EQ(cancelledError.code, NSURLErrorCancelled);
   // Do not abort the load if it is for an app specific URL, as such errors
   // are produced during the app specific URL load process.
-  return !web::GetWebClient()->IsAppSpecificURL(cancelledURL);
+  const GURL errorURL =
+      net::GURLWithNSURL(cancelledError.userInfo[NSURLErrorFailingURLErrorKey]);
+  BOOL isAppSpecificURL = web::GetWebClient()->IsAppSpecificURL(errorURL);
+  // Don't abort NSURLErrorCancelled errors originating from navigation, as the

[Eugene But (OOO till 7-30), 2015/06/23 21:27:14]

Early return here:

if (isAppSpecificURL)
  return NO;

[kkhorimoto, 2015/06/24 20:01:42]

Done.

+  // WKWebView will automatically retry these loads.
+  WKWebViewErrorSource source = WKWebViewErrorSourceFromError(cancelledError);
+  BOOL isFromNavigation = source == NAVIGATION;
+  return !isFromNavigation && !isAppSpecificURL;
 }
 
 #pragma mark Private methods
 
 - (NSString*)documentMIMEType {
   return _documentMIMEType.get();
 }
 
 - (void)setDocumentMIMEType:(NSString*)type {
   _documentMIMEType.reset([type copy]);
@@ skipping 577 matching lines @@
   [self registerLoadRequest:net::GURLWithNSURL(webView.URL)
                    referrer:[self currentReferrer]
                  transition:ui::PAGE_TRANSITION_SERVER_REDIRECT];
 }
 
 - (void)webView:(WKWebView *)webView
     didFailProvisionalNavigation:(WKNavigation *)navigation
                        withError:(NSError *)error {
   [self discardPendingReferrerString];
 
+  error = WKWebViewErrorWithSource(error, PROVISIONAL_LOAD);
 #if !defined(ENABLE_CHROME_NET_STACK_FOR_WKWEBVIEW)
   if (web::IsWKWebViewSSLError(error))
     [self handleSSLError:error];
   else
 #endif
     [self handleLoadError:error inMainFrame:YES];
 }
 
 - (void)webView:(WKWebView *)webView
     didCommitNavigation:(WKNavigation *)navigation {
@@ skipping 23 matching lines @@
   // TODO(jyquinn): Investigate using WKUserScriptInjectionTimeAtDocumentEnd to
   // inject this material at the appropriate time rather than invoking here.
   web::EvaluateJavaScript(webView,
                           @"__gCrWeb.didFinishNavigation()", nil);
   [self didFinishNavigation];
 }
 
 - (void)webView:(WKWebView *)webView
     didFailNavigation:(WKNavigation *)navigation
             withError:(NSError *)error {
-  [self handleLoadError:error inMainFrame:YES];
+  [self handleLoadError:WKWebViewErrorWithSource(error, NAVIGATION)
+            inMainFrame:YES];
 }
 
 - (void)webView:(WKWebView *)webView
     didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
                     completionHandler:
         (void (^)(NSURLSessionAuthChallengeDisposition disposition,
                   NSURLCredential *credential))completionHandler {
   NOTIMPLEMENTED();
   completionHandler(NSURLSessionAuthChallengeRejectProtectionSpace, nil);
 }
@@ skipping 83 matching lines @@
                               placeholderText:defaultText
                                    requestURL:
             net::GURLWithNSURL(frame.request.URL)
                             completionHandler:completionHandler];
   } else if (completionHandler) {
     completionHandler(nil);
   }
 }
 
 @end