Refactor PageLoadExtraInfo::committed_url to url and did_commit fields.

chrome/browser/page_load_metrics/metrics_web_contents_observer.cc

 // Copyright 2015 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/page_load_metrics/metrics_web_contents_observer.h"
 
 #include <algorithm>
 #include <ostream>
 #include <string>
 #include <utility>
@@ skipping 139 matching lines @@
   // never observed a committed load, use the last committed url from this
   // WebContent's opener. This is more accurate than using referrers due to
   // referrer sanitizing and origin referrers. Note that this could potentially
   // be inaccurate if the opener has since navigated.
   content::WebContents* opener = web_contents()->GetOpener();
   const GURL& opener_url =
       !has_navigated_ && opener
           ? web_contents()->GetOpener()->GetLastCommittedURL()
           : GURL::EmptyGURL();
   const GURL& currently_committed_url =
-      committed_load_ ? committed_load_->committed_url() : opener_url;
+      committed_load_ ? committed_load_->url() : opener_url;
   has_navigated_ = true;
 
   // We can have two provisional loads in some cases. E.g. a same-site
   // navigation can have a concurrent cross-process navigation started
   // from the omnibox.
   DCHECK_GT(2ul, provisional_loads_.size());
   // Passing raw pointers to observers_ and embedder_interface_ is safe because
   // the MetricsWebContentsObserver owns them both list and they are torn down
   // after the PageLoadTracker. The PageLoadTracker does not hold on to
   // committed_load_ or navigation_handle beyond the scope of the constructor.
@@ skipping 167 matching lines @@
       (navigation_handle->GetPageTransition() &
        ui::PAGE_TRANSITION_CLIENT_REDIRECT) != 0 &&
       committed_load_) {
     // TODO(bmcquade): consider carrying the user_gesture bit forward to the
     // redirected navigation.
     committed_load_->NotifyClientRedirectTo(*tracker);
   }
 
   committed_load_ = std::move(tracker);
   committed_load_->Commit(navigation_handle);
+  DCHECK(committed_load_->did_commit());
 }
 
 void MetricsWebContentsObserver::NavigationStopped() {
   // TODO(csharrison): Use a more user-initiated signal for STOP.
   NotifyAbortAllLoads(ABORT_STOP, UserInitiatedInfo::NotUserInitiated());
 }
 
 void MetricsWebContentsObserver::OnInputEvent(
     const blink::WebInputEvent& event) {
   // Ignore browser navigation or reload which comes with type Undefined.
@@ skipping 171 matching lines @@
     content::NavigationHandle* navigation_handle) const {
   DCHECK(navigation_handle->IsInMainFrame());
   DCHECK(!navigation_handle->HasCommitted() ||
          !navigation_handle->IsSamePage());
 
   return BrowserPageTrackDecider(embedder_interface_.get(), web_contents(),
                                  navigation_handle).ShouldTrack();
 }
 
 }  // namespace page_load_metrics