Implemented WebStateObserver::DidFinishNavigation(NavigationHandle*).

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 1797 matching lines @@
   // back/forward navigation, for instance, because the callback that would
   // populate it is not called in that flow.
   if ([_pendingNavigationInfo MIMEType])
     holder->set_mime_type([_pendingNavigationInfo MIMEType]);
 }
 
 - (void)loadNativeViewWithSuccess:(BOOL)loadSuccess {
   const GURL currentURL([self currentURL]);
   [self didStartLoadingURL:currentURL updateHistory:loadSuccess];
   _loadPhase = web::PAGE_LOADED;
+  if (!loadSuccess) {
+    _webStateImpl->OnErrorPageNavigation(currentURL);
+  } else {
+    _webStateImpl->OnNavigationCommitted(currentURL);
+  }
 
   // Perform post-load-finished updates.
   [self didFinishWithURL:currentURL loadSuccess:loadSuccess];
 
   NSString* title = [self.nativeController title];
   if (title)
     [self setNavigationItemTitle:title];
 
   // If the controller handles title change notification, route those to the
   // delegate.
@@ skipping 2273 matching lines @@
                                    linkClicked:linkActivatedNavigation];
 }
 
 - (CGFloat)headerHeight {
   if (![_delegate respondsToSelector:@selector(headerHeightForWebController:)])
     return 0.0f;
   return [_delegate headerHeightForWebController:self];
 }
 
 - (void)didUpdateHistoryStateWithPageURL:(const GURL&)url {
+  _webStateImpl->OnSamePageNavigation(url);
   [_delegate webDidUpdateHistoryStateWithPageURL:url];
 }
 
 - (void)updateSSLStatusForCurrentNavigationItem {
   if (_isBeingDestroyed) {
     return;
   }
 
   web::NavigationManager* navManager = self.webState->GetNavigationManager();
   web::NavigationItem* currentNavItem = navManager->GetLastCommittedItem();
@@ skipping 852 matching lines @@
   BOOL navigationWasCommitted = _loadPhase != web::LOAD_REQUESTED;
   if (!navigationWasCommitted &&
       (webViewURL.is_empty() || webViewURL == _documentURL)) {
     return;
   }
 
   if (!navigationWasCommitted && ![_pendingNavigationInfo cancelled]) {
     // A fast back/forward within the same origin does not call
     // |didCommitNavigation:|, so signal page change explicitly.
     DCHECK_EQ(_documentURL.GetOrigin(), webViewURL.GetOrigin());
+    BOOL isSameDocumentNavigaiton =
+        [self isKVOChangePotentialSameDocumentNavigationToURL:webViewURL];
     [self setDocumentURL:webViewURL];
+    if (!isSameDocumentNavigaiton) {

[kkhorimoto, 2017/02/22 01:42:38]

Let's reverse the ordering of these conditions so we're not checking the
negative of the bool.

[Eugene But (OOO till 7-30), 2017/02/22 17:54:33]

Done.

+      _webStateImpl->OnNavigationCommitted(webViewURL);
+    } else {
+      _webStateImpl->OnSamePageNavigation(webViewURL);
+    }
     [self webPageChanged];
   }
 
   [self updateSSLStatusForCurrentNavigationItem];
 
   // Fast back forward navigation may not call |didFinishNavigation:|, so
   // signal did finish navigation explicitly.
   if (_lastRegisteredRequestURL == _documentURL) {
     [self didFinishNavigation];
   }
@@ skipping 86 matching lines @@
            if (windowLocationMatchesNewURL &&
                newURLOriginMatchesDocumentURLOrigin &&
                webViewURLMatchesNewURL && URLDidChangeFromDocumentURL) {
              [self URLDidChangeWithoutDocumentChange:URL];
            }
          }];
   }
 }
 
 - (BOOL)isKVOChangePotentialSameDocumentNavigationToURL:(const GURL&)newURL {
-  DCHECK([_webView isLoading]);
   // If the origin changes, it can't be same-document.
   if (_documentURL.GetOrigin().is_empty() ||
       _documentURL.GetOrigin() != newURL.GetOrigin()) {
     return NO;
   }
   if (self.loadPhase == web::LOAD_REQUESTED) {
     // Normally LOAD_REQUESTED indicates that this is a regular, pending
     // navigation, but it can also happen during a fast-back navigation across
     // a hash change, so that case is potentially a same-document navigation.
     return web::GURLByRemovingRefFromGURL(newURL) ==
@@ skipping 27 matching lines @@
     // If this wasn't a previously-expected load (e.g., certain back/forward
     // navigations), register the load request.
     if (![self isLoadRequestPendingForURL:newURL])
       [self registerLoadRequest:newURL];
   }
 
   [self setDocumentURL:newURL];
 
   if (!_changingHistoryState) {
     [self didStartLoadingURL:_documentURL updateHistory:YES];
+    _webStateImpl->OnSamePageNavigation(newURL);
     [self updateSSLStatusForCurrentNavigationItem];
     [self didFinishNavigation];
   }
 }
 
 - (BOOL)isLoadRequestPendingForURL:(const GURL&)targetURL {
   if (self.loadPhase != web::LOAD_REQUESTED)
     return NO;
 
   web::NavigationItem* pendingItem =
@@ skipping 170 matching lines @@
 - (void)simulateLoadRequestWithURL:(const GURL&)URL {
   _lastRegisteredRequestURL = URL;
   _loadPhase = web::LOAD_REQUESTED;
 }
 
 - (NSString*)refererFromNavigationAction:(WKNavigationAction*)action {
   return [action.request valueForHTTPHeaderField:@"Referer"];
 }
 
 @end