Reland of "Cleaned up old navigation code that did not use pending navigation item."

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;
 @end
 
 @interface CountingObserver : NSObject<CRWWebControllerObserver>
 
 @property(nonatomic, readonly) int pageLoadedCount;
 @end
 
 @implementation CountingObserver
 @synthesize pageLoadedCount = _pageLoadedCount;
 
@@ skipping 98 matching lines @@
                        context:nullptr];
     [[result stub] removeObserver:web_controller() forKeyPath:OCMOCK_ANY];
 
     return result;
   }
 
   base::scoped_nsobject<UIScrollView> scroll_view_;
   base::scoped_nsobject<id> mock_web_view_;
 };
 
-#define MAKE_URL(url_string) GURL([url_string UTF8String])
-
-TEST_F(CRWWebControllerTest, UrlForHistoryNavigation) {
-  NSArray* urls_without_fragments = @[
-    @"http://one.com", @"http://two.com/", @"http://three.com/bar",
-    @"http://four.com/bar/", @"five", @"/six", @"/seven/", @""
-  ];
-
-  NSArray* fragments = @[ @"#", @"#bar" ];
-  NSMutableArray* urls_with_fragments = [NSMutableArray array];
-  for (NSString* url in urls_without_fragments) {
-    for (NSString* fragment in fragments) {
-      [urls_with_fragments addObject:[url stringByAppendingString:fragment]];
-    }
-  }
-
-  GURL previous_url;
-  web::NavigationItemImpl to_item;
-
-  // No start fragment: the end url is never changed.
-  for (NSString* start in urls_without_fragments) {
-    for (NSString* end in urls_with_fragments) {
-      previous_url = MAKE_URL(start);
-      to_item.SetURL(MAKE_URL(end));
-      EXPECT_EQ(MAKE_URL(end),
-                [web_controller() URLForHistoryNavigationToItem:&to_item
-                                                    previousURL:previous_url]);
-    }
-  }
-  // Both contain fragments: the end url is never changed.
-  for (NSString* start in urls_with_fragments) {
-    for (NSString* end in urls_with_fragments) {
-      previous_url = MAKE_URL(start);
-      to_item.SetURL(MAKE_URL(end));
-      EXPECT_EQ(MAKE_URL(end),
-                [web_controller() URLForHistoryNavigationToItem:&to_item
-                                                    previousURL:previous_url]);
-    }
-  }
-  for (unsigned start_index = 0; start_index < urls_with_fragments.count;
-       ++start_index) {
-    NSString* start = urls_with_fragments[start_index];
-    for (unsigned end_index = 0; end_index < urls_without_fragments.count;
-         ++end_index) {
-      NSString* end = urls_without_fragments[end_index];
-      previous_url = MAKE_URL(start);
-      if (start_index / 2 != end_index) {
-        // The URLs have nothing in common, they are left untouched.
-        to_item.SetURL(MAKE_URL(end));
-        EXPECT_EQ(
-            MAKE_URL(end),
-            [web_controller() URLForHistoryNavigationToItem:&to_item
-                                                previousURL:previous_url]);
-      } else {
-        // Start contains a fragment and matches end: An empty fragment is
-        // added.
-        to_item.SetURL(MAKE_URL(end));
-        EXPECT_EQ(
-            MAKE_URL([end stringByAppendingString:@"#"]),
-            [web_controller() URLForHistoryNavigationToItem:&to_item
-                                                previousURL:previous_url]);
-      }
-    }
-  }
-}
-
 // Tests that AllowCertificateError is called with correct arguments if
 // WKWebView fails to load a page with bad SSL cert.
 TEST_F(CRWWebControllerTest, SslCertError) {
   web::TestWebStateObserver observer(web_state());
   ASSERT_FALSE(observer.did_change_visible_security_state_info());
 
   // Last arguments passed to AllowCertificateError must be in default state.
   ASSERT_FALSE(GetWebClient()->last_cert_error_code());
   ASSERT_FALSE(GetWebClient()->last_cert_error_ssl_info().is_valid());
   ASSERT_FALSE(GetWebClient()->last_cert_error_ssl_info().cert_status);
@@ skipping 706 matching lines @@
   web::TestWebStateObserver* observer_ptr = &observer;
   web::SimulateWKWebViewCrash(webView_);
   base::test::ios::WaitUntilCondition(^bool() {
     return observer_ptr->render_process_gone_info();
   });
   EXPECT_EQ(web_state(), observer.render_process_gone_info()->web_state);
   EXPECT_FALSE([web_controller() isViewAlive]);
 };
 
 }  // namespace