Remove GetActiveEntry usage from content.

content/browser/web_contents/navigation_controller_impl.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 "content/browser/web_contents/navigation_controller_impl.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"  // Temporary
@@ skipping 250 matching lines @@
 }
 void NavigationControllerImpl::ReloadOriginalRequestURL(bool check_for_repost) {
   ReloadInternal(check_for_repost, RELOAD_ORIGINAL_REQUEST_URL);
 }
 
 void NavigationControllerImpl::ReloadInternal(bool check_for_repost,
                                               ReloadType reload_type) {
   if (transient_entry_index_ != -1) {
     // If an interstitial is showing, treat a reload as a navigation to the
     // transient entry's URL.
-    NavigationEntryImpl* active_entry =
-        NavigationEntryImpl::FromNavigationEntry(GetActiveEntry());
-    if (!active_entry)
+    NavigationEntryImpl* transient_entry =
+        NavigationEntryImpl::FromNavigationEntry(GetTransientEntry());
+    if (!transient_entry)
       return;
-    LoadURL(active_entry->GetURL(),
+    LoadURL(transient_entry->GetURL(),
             Referrer(),
             PAGE_TRANSITION_RELOAD,
-            active_entry->extra_headers());
+            transient_entry->extra_headers());
     return;
   }
 
   NavigationEntryImpl* entry = NULL;
   int current_index = -1;
 
   // If we are reloading the initial navigation, just use the current
   // pending entry.  Otherwise look up the current entry.
   if (IsInitialNavigation() && pending_entry_) {
     entry = pending_entry_;
@@ skipping 166 matching lines @@
 NavigationEntry* NavigationControllerImpl::GetLastCommittedEntry() const {
   if (last_committed_entry_index_ == -1)
     return NULL;
   return entries_[last_committed_entry_index_].get();
 }
 
 bool NavigationControllerImpl::CanViewSource() const {
   const std::string& mime_type = web_contents_->GetContentsMimeType();
   bool is_viewable_mime_type = net::IsSupportedNonImageMimeType(mime_type) &&
       !net::IsSupportedMediaMimeType(mime_type);
-  NavigationEntry* active_entry = GetActiveEntry();
-  return active_entry && !active_entry->IsViewSourceMode() &&
+  NavigationEntry* visible_entry = GetVisibleEntry();
+  return visible_entry && !visible_entry->IsViewSourceMode() &&
       is_viewable_mime_type && !web_contents_->GetInterstitialPage();
 }
 
 int NavigationControllerImpl::GetLastCommittedEntryIndex() const {
   return last_committed_entry_index_;
 }
 
 int NavigationControllerImpl::GetEntryCount() const {
   DCHECK(entries_.size() <= max_entry_count());
   return static_cast<int>(entries_.size());
@@ skipping 834 matching lines @@
 
   return true;
 }
 
 void NavigationControllerImpl::PruneAllButVisible() {
   PruneAllButVisibleInternal();
 
   // We should still have a last committed entry.
   DCHECK_NE(-1, last_committed_entry_index_);
 
-  NavigationEntryImpl* entry =
-      NavigationEntryImpl::FromNavigationEntry(GetActiveEntry());
   // We pass 0 instead of GetEntryCount() for the history_length parameter of
   // SetHistoryLengthAndPrune, because it will create history_length additional
   // history entries.
   // TODO(jochen): This API is confusing and we should clean it up.
   // http://crbug.com/178491
+  NavigationEntryImpl* entry =
+      NavigationEntryImpl::FromNavigationEntry(GetVisibleEntry());
   web_contents_->SetHistoryLengthAndPrune(
       entry->site_instance(), 0, entry->GetPageID());
 }
 
 void NavigationControllerImpl::PruneAllButVisibleInternal() {
   // It is up to callers to check the invariants before calling this.
   CHECK(CanPruneAllButVisible());
 
   // Erase all entries but the last committed entry.  There may still be a
   // new pending entry after this.
@@ skipping 212 matching lines @@
   if (pending_entry_ && !pending_entry_->site_instance() &&
       pending_entry_->restore_type() != NavigationEntryImpl::RESTORE_NONE) {
     pending_entry_->set_site_instance(static_cast<SiteInstanceImpl*>(
         web_contents_->GetPendingSiteInstance()));
     pending_entry_->set_restore_type(NavigationEntryImpl::RESTORE_NONE);
   }
 }
 
 void NavigationControllerImpl::NotifyNavigationEntryCommitted(
     LoadCommittedDetails* details) {
-  details->entry = GetActiveEntry();
+  details->entry = GetLastCommittedEntry();
 
   // We need to notify the ssl_manager_ before the web_contents_ so the
   // location bar will have up-to-date information about the security style
   // when it wants to draw.  See http://crbug.com/11157
   ssl_manager_.DidCommitProvisionalLoad(*details);
 
   web_contents_->NotifyNavigationStateChanged(kInvalidateAll);
   web_contents_->NotifyNavigationEntryCommitted(*details);
 
   // TODO(avi): Remove. http://crbug.com/170921
@@ skipping 114 matching lines @@
     }
   }
 }
 
 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
     const base::Callback<base::Time()>& get_timestamp_callback) {
   get_timestamp_callback_ = get_timestamp_callback;
 }
 
 }  // namespace content