Revert of Fix NavigationItem use-after-free crash in |-goToItemAtIndex:|

ios/web/web_state/ui/crw_web_controller_unittest.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>
 
 #include <utility>
 
@@ skipping 32 matching lines @@
 #import "testing/gtest_mac.h"
 #include "third_party/ocmock/OCMock/OCMock.h"
 #include "third_party/ocmock/gtest_support.h"
 #include "third_party/ocmock/ocmock_extensions.h"
 #import "ui/base/test/ios/ui_view_test_utils.h"
 
 using web::NavigationManagerImpl;
 
 @interface CRWWebController (PrivateAPI)
 @property(nonatomic, readwrite) web::PageDisplayState pageDisplayState;
-- (GURL)URLForHistoryNavigationToItem:(web::NavigationItem*)toItem
-                          previousURL:(const GURL&)previousURL;
+- (GURL)URLForHistoryNavigationFromItem:(web::NavigationItem*)fromItem
+                                 toItem:(web::NavigationItem*)toItem;
 @end
 
 // Used to mock CRWWebDelegate methods with C++ params.
 @interface MockInteractionLoader : OCMockComplexTypeHelper
 // Whether or not the delegate should block popups.
 @property(nonatomic, assign) BOOL blockPopups;
 // A web controller that will be returned by webPageOrdered... methods.
 @property(nonatomic, assign) CRWWebController* childWebController;
 
 // Values of arguments passed to
@@ skipping 204 matching lines @@
     @""
   ];
 
   NSArray* fragments = @[ @"#", @"#bar" ];
   NSMutableArray* urlsWithFragments = [NSMutableArray array];
   for (NSString* url in urlsNoFragments) {
     for (NSString* fragment in fragments) {
       [urlsWithFragments addObject:[url stringByAppendingString:fragment]];
     }
   }
-
-  GURL previous_url;
+  web::NavigationItemImpl fromItem;
   web::NavigationItemImpl toItem;
 
   // No start fragment: the end url is never changed.
   for (NSString* start in urlsNoFragments) {
     for (NSString* end in urlsWithFragments) {
-      previous_url = MAKE_URL(start);
+      fromItem.SetURL(MAKE_URL(start));
       toItem.SetURL(MAKE_URL(end));
       EXPECT_EQ(MAKE_URL(end),
-                [web_controller() URLForHistoryNavigationToItem:&toItem
-                                                    previousURL:previous_url]);
+                [web_controller() URLForHistoryNavigationFromItem:&fromItem
+                                                           toItem:&toItem]);
     }
   }
   // Both contain fragments: the end url is never changed.
   for (NSString* start in urlsWithFragments) {
     for (NSString* end in urlsWithFragments) {
-      previous_url = MAKE_URL(start);
+      fromItem.SetURL(MAKE_URL(start));
       toItem.SetURL(MAKE_URL(end));
       EXPECT_EQ(MAKE_URL(end),
-                [web_controller() URLForHistoryNavigationToItem:&toItem
-                                                    previousURL:previous_url]);
+                [web_controller() URLForHistoryNavigationFromItem:&fromItem
+                                                           toItem:&toItem]);
     }
   }
   for (unsigned start_index = 0; start_index < [urlsWithFragments count];
        ++start_index) {
     NSString* start = urlsWithFragments[start_index];
     for (unsigned end_index = 0; end_index < [urlsNoFragments count];
          ++end_index) {
       NSString* end = urlsNoFragments[end_index];
-      previous_url = MAKE_URL(start);
       if (start_index / 2 != end_index) {
         // The URLs have nothing in common, they are left untouched.
+        fromItem.SetURL(MAKE_URL(start));
         toItem.SetURL(MAKE_URL(end));
-        EXPECT_EQ(
-            MAKE_URL(end),
-            [web_controller() URLForHistoryNavigationToItem:&toItem
-                                                previousURL:previous_url]);
+        EXPECT_EQ(MAKE_URL(end),
+                  [web_controller() URLForHistoryNavigationFromItem:&fromItem
+                                                             toItem:&toItem]);
       } else {
         // Start contains a fragment and matches end: An empty fragment is
         // added.
+        fromItem.SetURL(MAKE_URL(start));
         toItem.SetURL(MAKE_URL(end));
-        EXPECT_EQ(
-            MAKE_URL([end stringByAppendingString:@"#"]),
-            [web_controller() URLForHistoryNavigationToItem:&toItem
-                                                previousURL:previous_url]);
+        EXPECT_EQ(MAKE_URL([end stringByAppendingString:@"#"]),
+                  [web_controller() URLForHistoryNavigationFromItem:&fromItem
+                                                             toItem:&toItem]);
       }
     }
   }
 }
 
 // Tests that AllowCertificateError is called with correct arguments if
 // WKWebView fails to load a page with bad SSL cert.
 TEST_F(CRWWebControllerTest, SslCertError) {
   // Last arguments passed to AllowCertificateError must be in default state.
   ASSERT_FALSE(GetWebClient()->last_cert_error_code());
@@ skipping 734 matching lines @@
   };
 
   RenderProcessGoneObserver observer(web_state());
   web::SimulateWKWebViewCrash(webView_);
   observer.WaitForRenderProcessGone();
 
   EXPECT_FALSE([web_controller() isViewAlive]);
 };
 
 }  // namespace