Remove HistoryController::GetPreviousEntry.

content/renderer/history_controller.cc

 // Copyright 2014 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.
 
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
@@ skipping 58 matching lines @@
   if (same_document_loads.empty() && different_document_loads.empty()) {
     // If we don't have any frames to navigate at this point, either
     // (1) there is no previous history entry to compare against, or
     // (2) we were unable to match any frames by name. In the first case,
     // doing a different document navigation to the root item is the only valid
     // thing to do. In the second case, we should have been able to find a
     // frame to navigate based on names if this were a same document
     // navigation, so we can safely assume this is the different document case.
     different_document_loads.push_back(
         std::make_pair(main_frame, provisional_entry_->root()));
-  } else if (different_document_loads.empty()) {
-    // If we have only same document navigations to perform, immediately
-    // declare the load "committed" by updating the current entry.
-    // TODO(japhet): This is a historical quirk, because same-document
-    // history navigations call UpdateForCommit() with commit type
-    // HistoryInertCommit. If that is fixed, we can remove this block.
-    previous_entry_.reset(current_entry_.release());
-    current_entry_.reset(provisional_entry_.release());
   }
 
   for (size_t i = 0; i < same_document_loads.size(); ++i) {
     WebFrame* frame = same_document_loads[i].first;
     if (!RenderFrameImpl::FromWebFrame(frame))
       continue;
     frame->loadHistoryItem(same_document_loads[i].second,
                            blink::WebHistorySameDocumentLoad,
                            cache_policy);
   }
@@ skipping 56 matching lines @@
   }
 }
 
 void HistoryController::UpdateForCommit(RenderFrameImpl* frame,
                                         const WebHistoryItem& item,
                                         WebHistoryCommitType commit_type,
                                         bool navigation_within_page) {
   if (commit_type == blink::WebBackForwardCommit) {
     if (!provisional_entry_)
       return;
-    previous_entry_.reset(current_entry_.release());
     current_entry_.reset(provisional_entry_.release());
   } else if (commit_type == blink::WebStandardCommit) {
     CreateNewBackForwardItem(frame, item, navigation_within_page);
   } else if (commit_type == blink::WebInitialCommitInChildFrame) {
     UpdateForInitialLoadInChildFrame(frame, item);
   }
 }
 
 HistoryEntry* HistoryController::GetCurrentEntry() {
   return current_entry_.get();
 }
 
-HistoryEntry* HistoryController::GetPreviousEntry() {
-  return previous_entry_.get();
-}
-
 WebHistoryItem HistoryController::GetItemForNewChildFrame(
     RenderFrameImpl* frame) const {
   if (!current_entry_)
     return WebHistoryItem();
   return current_entry_->GetItemForFrame(frame);
 }
 
 void HistoryController::RemoveChildrenForRedirect(RenderFrameImpl* frame) {
   if (!provisional_entry_)
     return;
   if (HistoryEntry::HistoryNode* node =
           provisional_entry_->GetHistoryNodeForFrame(frame))
     node->RemoveChildren();
 }
 
 void HistoryController::CreateNewBackForwardItem(
     RenderFrameImpl* target_frame,
     const WebHistoryItem& new_item,
     bool clone_children_of_target) {
   if (!current_entry_) {
     current_entry_.reset(
         new HistoryEntry(new_item, target_frame->GetRoutingID()));
   } else {
-    previous_entry_.reset(current_entry_.release());
-    current_entry_.reset(previous_entry_->CloneAndReplace(
+    current_entry_.reset(current_entry_->CloneAndReplace(
         new_item, clone_children_of_target, target_frame, render_view_));
   }
 }
 
 }  // namespace content