Renamed kDisplayingErrorForFailedNavigation enum value.

The new name is kDisplayingNativeErrorForFailedNavigation. This change
is needed to support HTML based error pages which will use
kDisplayingWebErrorForFailedNavigation enum.

Bug: 725241
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Id68e8239d9706b8d98bc591a0d264609b13e23c0
Reviewed-on: https://chromium-review.googlesource.com/1015531Reviewed-by: Danyao Wang <danyao@chromium.org>
Commit-Queue: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551493}

ios/web/navigation/navigation_item_impl.h

@@ -25,10 +25,11 @@ enum class NavigationInitiationType;
 // CRWWebController to coordinate the display of native error views such that
 // back/forward navigation to a native error view automatically triggers a
 // reload of the original URL. This is achieved in four steps:
-// 1) A NavigationItem is put into kDisplayingErrorForFailedNavigationState when
-//    it first failed to load and a native error view displayed. If the failure
-//    occurred during provisional navigation, a placeholder entry is inserted
-//    into WKBackForwardList for this item.
+// 1) A NavigationItem is put into
+//    kDisplayingNativeErrorForFailedNavigationState when it first failed to
+//    load and a native error view displayed. If the failure occurred during
+//    provisional navigation, a placeholder entry is inserted into
+//    WKBackForwardList for this item.
 // 2) Upon navigation to this item, use |loadHTMLString:| to modify the URL of
 //    the placeholder entry to the original URL and change the item state to
 //    kNavigatingToFailedNavigationItem.
@@ -44,7 +45,7 @@ enum class ErrorRetryState {
   // error in native view.
   kReadyToDisplayErrorForFailedNavigation,
   // This navigation item failed to load and a native error is displayed.
-  kDisplayingErrorForFailedNavigation,
+  kDisplayingNativeErrorForFailedNavigation,
   // This navigation item is reactivated due to back/forward navigation and
   // needs to try reloading.
   kNavigatingToFailedNavigationItem,

ios/web/navigation/navigation_item_impl.mm

@@ -303,12 +303,12 @@ void NavigationItemImpl::SetErrorRetryState(ErrorRetryState state) {
              error_retry_state_ == ErrorRetryState::kRetryFailedNavigationItem)
           << "Got unexpected state: " << static_cast<int>(error_retry_state_);
       break;
-    case ErrorRetryState::kDisplayingErrorForFailedNavigation:
+    case ErrorRetryState::kDisplayingNativeErrorForFailedNavigation:
       DCHECK_EQ(ErrorRetryState::kReadyToDisplayErrorForFailedNavigation,
                 error_retry_state_);
       break;
     case ErrorRetryState::kNavigatingToFailedNavigationItem:
-      DCHECK_EQ(ErrorRetryState::kDisplayingErrorForFailedNavigation,
+      DCHECK_EQ(ErrorRetryState::kDisplayingNativeErrorForFailedNavigation,
                 error_retry_state_);
       break;
     case ErrorRetryState::kRetryFailedNavigationItem:

ios/web/navigation/navigation_item_impl_unittest.mm

@@ -185,8 +185,9 @@ TEST_F(NavigationItemTest, SetErrorRetryState) {
   ASSERT_EQ(ErrorRetryState::kReadyToDisplayErrorForFailedNavigation,
             item.GetErrorRetryState());
 
-  item.SetErrorRetryState(ErrorRetryState::kDisplayingErrorForFailedNavigation);
-  ASSERT_EQ(ErrorRetryState::kDisplayingErrorForFailedNavigation,
+  item.SetErrorRetryState(
+      ErrorRetryState::kDisplayingNativeErrorForFailedNavigation);
+  ASSERT_EQ(ErrorRetryState::kDisplayingNativeErrorForFailedNavigation,
             item.GetErrorRetryState());
 
   item.SetErrorRetryState(ErrorRetryState::kNavigatingToFailedNavigationItem);
@@ -203,7 +204,8 @@ TEST_F(NavigationItemTest, SetErrorRetryState) {
             item.GetErrorRetryState());
 
   // Cycle through again, this time, terminate in no error.
-  item.SetErrorRetryState(ErrorRetryState::kDisplayingErrorForFailedNavigation);
+  item.SetErrorRetryState(
+      ErrorRetryState::kDisplayingNativeErrorForFailedNavigation);
   item.SetErrorRetryState(ErrorRetryState::kNavigatingToFailedNavigationItem);
   item.SetErrorRetryState(ErrorRetryState::kRetryFailedNavigationItem);
   item.SetErrorRetryState(ErrorRetryState::kNoNavigationError);

ios/web/web_state/ui/crw_web_controller.mm

@@ -1744,7 +1744,7 @@ registerLoadRequestForURL:(const GURL&)requestURL
     [self removeWebView];
   } else {
     item->SetErrorRetryState(
-        web::ErrorRetryState::kDisplayingErrorForFailedNavigation);
+        web::ErrorRetryState::kDisplayingNativeErrorForFailedNavigation);
   }
   id<CRWNativeContent> nativeContent =
       [_nativeProvider controllerForURL:currentURL
@@ -4730,7 +4730,8 @@ registerLoadRequestForURL:(const GURL&)requestURL
                                    navigationContext:context];
       } else {
         // This is a back/forward navigation to a native error page.
-        DCHECK_EQ(web::ErrorRetryState::kDisplayingErrorForFailedNavigation,
+        DCHECK_EQ(
+            web::ErrorRetryState::kDisplayingNativeErrorForFailedNavigation,
             errorRetryState);
       }
     }
@@ -4740,7 +4741,7 @@ registerLoadRequestForURL:(const GURL&)requestURL
     // the error retry state.
     if (!web::GetWebClient()->IsAppSpecificURL(item->GetURL())) {
       switch (errorRetryState) {
-        case web::ErrorRetryState::kDisplayingErrorForFailedNavigation:
+        case web::ErrorRetryState::kDisplayingNativeErrorForFailedNavigation:
           DCHECK(context->GetPageTransition() &
                  ui::PAGE_TRANSITION_FORWARD_BACK);
           if (item->GetURL() == webViewURL) {