| Index: content/browser/frame_host/render_frame_host_manager.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
|
| index 2dfc2218b3e1e47ee2cfc82be509192a4b15e1b9..5179e1af3ac65c6e901605e0880b933589e1111d 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager.cc
|
| +++ b/content/browser/frame_host/render_frame_host_manager.cc
|
| @@ -164,8 +164,7 @@ RenderFrameHostImpl* RenderFrameHostManager::Navigate(
|
| const NavigationEntryImpl& entry) {
|
| TRACE_EVENT0("browser", "RenderFrameHostManager:Navigate");
|
| // Create a pending RenderFrameHost to use for the navigation.
|
| - RenderFrameHostImpl* dest_render_frame_host =
|
| - UpdateRendererStateForNavigate(entry);
|
| + RenderFrameHostImpl* dest_render_frame_host = UpdateStateForNavigate(entry);
|
| if (!dest_render_frame_host)
|
| return NULL; // We weren't able to create a pending render frame host.
|
|
|
| @@ -1168,7 +1167,7 @@ void RenderFrameHostManager::ShutdownRenderFrameHostsInSiteInstance(
|
| }
|
| }
|
|
|
| -RenderFrameHostImpl* RenderFrameHostManager::UpdateRendererStateForNavigate(
|
| +RenderFrameHostImpl* RenderFrameHostManager::UpdateStateForNavigate(
|
| const NavigationEntryImpl& entry) {
|
| // If we are currently navigating cross-process, we want to get back to normal
|
| // and then navigate as usual.
|
|
|