Add GetOriginalRequestURL() to NavigationItem interface.

ios/web/navigation/crw_session_entry.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/navigation/crw_session_entry.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 27 matching lines @@
 NSString* const kSessionEntryTimestampKey = @"timestamp";
 NSString* const kSessionEntryTitleKey = @"title";
 NSString* const kSessionEntryPOSTDataKey = @"POSTData";
 NSString* const kSessionEntryHTTPRequestHeadersKey = @"httpHeaders";
 NSString* const kSessionEntrySkipResubmitConfirmationKey =
     @"skipResubmitDataConfirmation";
 NSString* const kSessionEntryUseDesktopUserAgentKey = @"useDesktopUserAgent";
 }
 
 @interface CRWSessionEntry () {
-  // The original URL of the page.  In cases where a redirect occurred, |url_|
-  // will contain the final post-redirect URL, and |originalUrl_| will contain
-  // the pre-redirect URL.  This field is not persisted to disk.
-  GURL _originalUrl;
-
   // The NavigationItemImpl corresponding to this CRWSessionEntry.
   // TODO(stuartmorgan): Move ownership to NavigationManagerImpl.
   std::unique_ptr<web::NavigationItemImpl> _navigationItem;
 }
-// Redefine originalUrl to be read-write.
-@property(nonatomic, readwrite) const GURL& originalUrl;
 
 // Converts a serialized NSDictionary to a web::PageDisplayState.
 + (web::PageDisplayState)pageDisplayStateFromDictionary:
         (NSDictionary*)dictionary;
 // Serializes a web::PageDisplayState to an NSDictionary.
 + (NSDictionary*)dictionaryFromPageDisplayState:
         (const web::PageDisplayState&)displayState;
 // Returns a readable description of |displayState|.
 + (NSString*)descriptionForPageDisplayState:
         (const web::PageDisplayState&)displayState;
 @end
 
 @implementation CRWSessionEntry
 
-@synthesize originalUrl = _originalUrl;
-
 - (instancetype)initWithNavigationItem:
     (std::unique_ptr<web::NavigationItem>)item {
   self = [super init];
   if (self) {
     _navigationItem.reset(
         static_cast<web::NavigationItemImpl*>(item.release()));
-    self.originalUrl = _navigationItem->GetURL();

[Eugene But (OOO till 7-30), 2016/12/16 22:18:18]

Do we need to do this?:
|_navigationItem->SetOriginalRequestURL(_navigationItem->GetURL());|

At least until we audit all initWithNavigationItems: places and make sure that
original URL is properly set there.

[kkhorimoto, 2017/01/21 02:41:29]

This line is no longer necessary, as the original request URLs are copied in the
NavigationItem copy constructor.

   }
   return self;
 }
 
 - (instancetype)initWithCoder:(NSCoder*)aDecoder {
   self = [super init];
   if (self) {
     _navigationItem.reset(new web::NavigationItemImpl());
 
     // Desktop chrome only persists virtualUrl_ and uses it to feed the url
     // when creating a NavigationEntry.
     GURL url;
     if ([aDecoder containsValueForKey:web::kSessionEntryURLKey]) {
       url = GURL(
           web::nscoder_util::DecodeString(aDecoder, web::kSessionEntryURLKey));
     } else {
       // Backward compatibility.
       url = net::GURLWithNSURL(
           [aDecoder decodeObjectForKey:web::kSessionEntryURLDeperecatedKey]);
     }
+    _navigationItem->SetOriginalRequestURL(url);
     _navigationItem->SetURL(url);
-    self.originalUrl = url;
 
     if ([aDecoder containsValueForKey:web::kSessionEntryReferrerURLKey]) {
       const std::string referrerString(web::nscoder_util::DecodeString(
           aDecoder, web::kSessionEntryReferrerURLKey));
       web::ReferrerPolicy referrerPolicy = static_cast<web::ReferrerPolicy>(
           [aDecoder decodeIntForKey:web::kSessionEntryReferrerPolicyKey]);
       _navigationItem->SetReferrer(
           web::Referrer(GURL(referrerString), referrerPolicy));
     } else {
       // Backward compatibility.
@@ skipping 55 matching lines @@
   [aCoder encodeObject:_navigationItem->GetHttpRequestHeaders()
                 forKey:web::kSessionEntryHTTPRequestHeadersKey];
 }
 
 // TODO(ios): Shall we overwrite EqualTo:?
 
 - (instancetype)copyWithZone:(NSZone*)zone {
   CRWSessionEntry* copy = [[[self class] alloc] init];
   copy->_navigationItem.reset(
       new web::NavigationItemImpl(*_navigationItem.get()));
-  copy->_originalUrl = _originalUrl;
   return copy;
 }
 
 - (NSString*)description {
   return [NSString
       stringWithFormat:
           @"url:%@ originalurl:%@ title:%@ transition:%d displayState:%@ "
           @"desktopUA:%d",
           base::SysUTF8ToNSString(_navigationItem->GetURL().spec()),
-          base::SysUTF8ToNSString(self.originalUrl.spec()),
+          base::SysUTF8ToNSString(
+              _navigationItem->GetOriginalRequestURL().spec()),
           base::SysUTF16ToNSString(_navigationItem->GetTitle()),
           _navigationItem->GetTransitionType(),
-          [[self class] descriptionForPageDisplayState:
-                            _navigationItem->GetPageDisplayState()],
+          [[self class]
+              descriptionForPageDisplayState:_navigationItem
+                                                 ->GetPageDisplayState()],
           _navigationItem->IsOverridingUserAgent()];
 }
 
 - (web::NavigationItem*)navigationItem {
   return _navigationItem.get();
 }
 
 - (web::NavigationItemImpl*)navigationItemImpl {
   return _navigationItem.get();
 }
@@ skipping 42 matching lines @@
   return
       [NSString stringWithFormat:kPageScrollStateDescriptionFormat,
                                  displayState.scroll_state().offset_x(),
                                  displayState.scroll_state().offset_y(),
                                  displayState.zoom_state().minimum_zoom_scale(),
                                  displayState.zoom_state().maximum_zoom_scale(),
                                  displayState.zoom_state().zoom_scale()];
 }
 
 @end