Remove WebContentsObserver::DidCommitNavigation

chrome/browser/captive_portal/captive_portal_tab_helper.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 
 #include "base/bind.h"
 #include "chrome/browser/captive_portal/captive_portal_login_detector.h"
 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
@@ skipping 64 matching lines @@
 void CaptivePortalTabHelper::DidRedirectNavigation(
     content::NavigationHandle* navigation_handle) {
   DCHECK(CalledOnValidThread());
   if (navigation_handle != navigation_handle_)
     return;
   DCHECK(navigation_handle->IsInMainFrame());
   tab_reloader_->OnRedirect(
       navigation_handle->GetURL().SchemeIsCryptographic());
 }
 
-void CaptivePortalTabHelper::DidCommitNavigation(
+void CaptivePortalTabHelper::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   DCHECK(CalledOnValidThread());
   if (!navigation_handle->IsInMainFrame())
     return;
 
-  if (navigation_handle_ != navigation_handle)
+  bool navigation_has_committed = navigation_handle->HasCommittedDocument() ||
+                                  navigation_handle->HasCommittedErrorPage();

[Charlie Reis, 2015/09/18 17:05:20]

Seems like lots of places will have to use this pattern, which is a bit awkward.
 Would it make sense to have HasCommitted() (true for either a normal page or
error page) and IsErrorPage() (to distinguish between the two) instead?

[clamy, 2015/09/18 20:37:33]

Done.

+
+  if (navigation_handle_ != navigation_handle) {
+    if (!navigation_has_committed)
+      return;
     DidStartNavigation(navigation_handle);
+  }
 
-  tab_reloader_->OnLoadCommitted(navigation_handle->GetNetErrorCode());
+  if (navigation_has_committed)
+    tab_reloader_->OnLoadCommitted(navigation_handle->GetNetErrorCode());
+  else
+    tab_reloader_->OnAbort();
+
+  navigation_handle_ = nullptr;
 }
 
-void CaptivePortalTabHelper::DidFinishNavigation(
-    content::NavigationHandle* navigation_handle) {
-  DCHECK(CalledOnValidThread());
-  if (navigation_handle != navigation_handle_)
-    return;
-  DCHECK(navigation_handle->IsInMainFrame());
-
-  if (!navigation_handle->HasCommittedDocument() &&
-      !navigation_handle->HasCommittedErrorPage()) {
-    tab_reloader_->OnAbort();
-  }
-
+void CaptivePortalTabHelper::DidStopLoading() {
   login_detector_->OnStoppedLoading();
-
-  navigation_handle_ = nullptr;
 }
 
 void CaptivePortalTabHelper::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT, type);
   DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());
 
@@ skipping 61 matching lines @@
 }
 
 void CaptivePortalTabHelper::SetTabReloaderForTest(
     CaptivePortalTabReloader* tab_reloader) {
   tab_reloader_.reset(tab_reloader);
 }
 
 CaptivePortalTabReloader* CaptivePortalTabHelper::GetTabReloaderForTest() {
   return tab_reloader_.get();
 }