| Index: content/browser/tab_contents/tab_contents.cc
|
| ===================================================================
|
| --- content/browser/tab_contents/tab_contents.cc (revision 112335)
|
| +++ content/browser/tab_contents/tab_contents.cc (working copy)
|
| @@ -921,13 +921,13 @@
|
| const GURL& opener_url,
|
| const GURL& url) {
|
| bool is_error_page = (url.spec() == chrome::kUnreachableWebDataURL);
|
| + RenderViewHost* rvh = render_manager_.pending_render_view_host() ?
|
| + render_manager_.pending_render_view_host() : render_view_host();
|
| +
|
| GURL validated_url(url);
|
| - render_view_host()->FilterURL(ChildProcessSecurityPolicy::GetInstance(),
|
| - GetRenderProcessHost()->GetID(), &validated_url);
|
| + RenderViewHost::FilterURL(ChildProcessSecurityPolicy::GetInstance(),
|
| + rvh->process()->GetID(), &validated_url);
|
|
|
| - RenderViewHost* rvh =
|
| - render_manager_.pending_render_view_host() ?
|
| - render_manager_.pending_render_view_host() : render_view_host();
|
| // Notify observers about the start of the provisional load.
|
| FOR_EACH_OBSERVER(TabContentsObserver, observers_,
|
| DidStartProvisionalLoadForFrame(frame_id, is_main_frame,
|
|
|