Store NavigationItem's unique ID in navigation context.

ios/web/web_state/ui/crw_web_controller.mm

 // Copyright 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.
 
 #import "ios/web/web_state/ui/crw_web_controller.h"
 
 #import <WebKit/WebKit.h>
 
 #import <objc/runtime.h>
 #include <stddef.h>
@@ skipping 1514 matching lines @@
   } else {
     // A new session history entry needs to be created.
     self.navigationManagerImpl->AddPendingItem(
         requestURL, referrer, transition,
         web::NavigationInitiationType::RENDERER_INITIATED,
         web::NavigationManager::UserAgentOverrideOption::INHERIT);
   }
   std::unique_ptr<web::NavigationContextImpl> context =
       web::NavigationContextImpl::CreateNavigationContext(_webStateImpl,
                                                           requestURL);
+
+  web::NavigationItem* item = self.navigationManagerImpl->GetPendingItem();
+  // TODO(crbug.com/676129): AddPendingItem does not always create a pending
+  // item. Remove this workaround once the bug is fixed.
+  if (!item) {
+    item = self.navigationManagerImpl->GetLastCommittedItem();
+  }
+  context->SetNavigationItemUniqueID(item->GetUniqueID());
   _webStateImpl->SetIsLoading(true);
   // TODO(crbug.com/713836): pass context to |OnProvisionalNavigationStarted|.
   _webStateImpl->OnProvisionalNavigationStarted(requestURL);
   return context;
 }
 
 - (void)updateHTML5HistoryState {
   web::NavigationItemImpl* currentItem = self.currentNavItem;
   if (!currentItem)
     return;
@@ skipping 3000 matching lines @@
     // In unit tests MIME type will be empty, because loadHTML:forURL: does not
     // notify web view delegate about received response, so web controller does
     // not get a chance to properly update MIME type.
     [_windowIDJSManager inject];
   }
 
   if (isLastNavigation) {
     [self webPageChanged];
   } else {
     // WKWebView has more than one in progress navigation, and committed
-    // navigation was not the latest. It is critical to keep last committed
-    // URL the same as actual document URL, so try guessing which navigation
-    // item should be set to current.
-    // TODO(crbug.com/712269):
+    // navigation was not the latest. Change last committed item to one that
+    // corresponds to committed navigation.
+    web::NavigationContextImpl* context =
+        [_navigationStates contextForNavigation:navigation];
     for (int i = 0; i < self.navigationManagerImpl->GetItemCount(); i++) {
-      web::NavigationItem* item = self.navigationManagerImpl->GetItemAtIndex(i);
-      if (item->GetURL() == _documentURL) {
+      if (self.navigationManagerImpl->GetItemAtIndex(i)->GetUniqueID() ==
+          context->GetNavigationItemUniqueID()) {
         // Do not discard pending entry, because another pending navigation is
         // still in progress and will commit or fail soon.
         [self.sessionController goToItemAtIndex:i discardNonCommittedItems:NO];
+        break;
       }
     }
   }
 
   web::NavigationContextImpl* context =
       [_navigationStates contextForNavigation:navigation];
   context->SetResponseHeaders(_webStateImpl->GetHttpResponseHeaders());
   self.webStateImpl->OnNavigationFinished(context);
 
   [self updateSSLStatusForCurrentNavigationItem];
@@ skipping 586 matching lines @@
 - (NSUInteger)observerCount {
   DCHECK_EQ(_observerBridges.size(), [_observers count]);
   return [_observers count];
 }
 
 - (NSString*)referrerFromNavigationAction:(WKNavigationAction*)action {
   return [action.request valueForHTTPHeaderField:kReferrerHeaderName];
 }
 
 @end