Add GetOriginalRequestURL() to NavigationItem interface.

ios/chrome/browser/tabs/tab.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/chrome/browser/tabs/tab.h"
 
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
 
 #include <utility>
@@ skipping 1024 matching lines @@
   DCHECK(historyService);
   historyService->SetPageTitle(self.url, base::SysNSStringToUTF16(title));
 }
 
 - (void)addCurrentEntryToHistoryDB {
   DCHECK(self.currentSessionEntry);
   // If incognito, don't update history.
   if (browserState_->IsOffTheRecord())
     return;
 
-  CRWSessionEntry* sessionEntry = self.currentSessionEntry;
   web::NavigationItem* item = [self navigationManager]->GetVisibleItem();
 
   // Do not update the history db for back/forward navigations.
   // TODO(crbug.com/661667): We do not currently tag the entry with a
   // FORWARD_BACK transition. Fix.
   if (item->GetTransitionType() & ui::PAGE_TRANSITION_FORWARD_BACK)
     return;
 
   history::HistoryService* historyService =
       ios::HistoryServiceFactory::GetForBrowserState(
           browserState_, ServiceAccessType::IMPLICIT_ACCESS);
   DCHECK(historyService);
 
   const GURL url(item->GetURL());
   const web::Referrer& referrer = item->GetReferrer();
 
 // Do not update the history db for data: urls.  This diverges from upstream,
 // but prevents us from dumping huge view-source urls into the history
 // database.  Since view-source is only activated in Debug builds, this check
 // can be Debug-only as well.
 #ifndef NDEBUG
   if (url.scheme() == url::kDataScheme)
     return;
 #endif
 
   history::RedirectList redirects;
-  if (item->GetURL() != sessionEntry.originalUrl) {
+  GURL originalURL = item->GetOriginalRequestURL();
+  if (item->GetURL() != originalURL) {
     // Simulate a valid redirect chain in case of URL that have been modified
     // in |CRWWebController finishHistoryNavigationFromEntry:|.
     const std::string& urlSpec = item->GetURL().spec();
     size_t urlSpecLength = urlSpec.size();
     if (item->GetTransitionType() & ui::PAGE_TRANSITION_CLIENT_REDIRECT ||
         (urlSpecLength && (urlSpec.at(urlSpecLength - 1) == '#') &&
-         !urlSpec.compare(0, urlSpecLength - 1,
-                          sessionEntry.originalUrl.spec()))) {
+         !urlSpec.compare(0, urlSpecLength - 1, originalURL.spec()))) {
       redirects.push_back(referrer.url);
     }
     // TODO(crbug.com/661670): the redirect chain is not constructed the same
     // way as upstream so this part needs to be revised.
-    redirects.push_back(sessionEntry.originalUrl);
+    redirects.push_back(originalURL);
     redirects.push_back(url);
   }
 
   DCHECK(item->GetTimestamp().ToInternalValue() > 0);
   if ([self isPrerenderTab]) {
     // Clicks on content suggestions on the NTP should not contribute to the
     // Most Visited tiles in the NTP.
     const bool consider_for_ntp_most_visited =
         referrer.url != GURL(kChromeContentSuggestionsReferrer);
 
@@ skipping 503 matching lines @@
   ui::PageTransition transition =
       ui::PageTransitionFromInt(ui::PAGE_TRANSITION_FORM_SUBMIT);
   DCHECK([self navigationManager]);
   CRWSessionController* sessionController =
       [self navigationManager]->GetSessionController();
   CRWSessionEntry* lastUserEntry = [sessionController lastUserEntry];
   if (!lastUserEntry)
     return;
 
   // |originalUrl| will be empty if a page was open by DOM.
-  GURL reloadURL(lastUserEntry.originalUrl);
+  GURL reloadURL(lastUserEntry.navigationItem->GetOriginalRequestURL());
   if (reloadURL.is_empty()) {
     DCHECK(sessionController.openedByDOM);
     reloadURL = [lastUserEntry navigationItem]->GetVirtualURL();
   }
 
   web::NavigationManager::WebLoadParams params(reloadURL);
   params.referrer = lastUserEntry.navigationItem->GetReferrer();
   params.transition_type = transition;
   if (self.navigationManager)
     self.navigationManager->LoadURLWithParams(params);
@@ skipping 714 matching lines @@
 
 - (TabModel*)parentTabModel {
   return parentTabModel_;
 }
 
 - (FormInputAccessoryViewController*)inputAccessoryViewController {
   return inputAccessoryViewController_.get();
 }
 
 @end