| Index: content/renderer/history_controller.cc
|
| diff --git a/content/renderer/history_controller.cc b/content/renderer/history_controller.cc
|
| index f2d3d96d341213eeb0ceda09b3d1aa2d1c9fd9e3..5f53009158b24e4d5a4e14ca3b8a41525c8cae7d 100644
|
| --- a/content/renderer/history_controller.cc
|
| +++ b/content/renderer/history_controller.cc
|
| @@ -153,7 +153,7 @@ void HistoryController::UpdateForInitialLoadInChildFrame(
|
| return;
|
| if (HistoryEntry::HistoryNode* parent_history_node =
|
| current_entry_->GetHistoryNodeForFrame(parent)) {
|
| - parent_history_node->AddChild(item, frame->GetRoutingID());
|
| + parent_history_node->AddChild(item);
|
| }
|
| }
|
|
|
| @@ -217,8 +217,7 @@ void HistoryController::CreateNewBackForwardItem(
|
| const WebHistoryItem& new_item,
|
| bool clone_children_of_target) {
|
| if (!current_entry_) {
|
| - current_entry_.reset(
|
| - new HistoryEntry(new_item, target_frame->GetRoutingID()));
|
| + current_entry_.reset(new HistoryEntry(new_item));
|
| } else {
|
| current_entry_.reset(current_entry_->CloneAndReplace(
|
| new_item, clone_children_of_target, target_frame, render_view_));
|
|
|