From 5c4f4f601a20b05d38383d5ecb0045384ee12a6b Mon Sep 17 00:00:00 2001 From: "ananta@chromium.org" Date: Thu, 17 Dec 2009 21:43:15 +0000 Subject: Attempt 2 at landing this. This fixes the incognito mode ui test failures. Fix a crash in ChromeFrame caused by incorrectly instantiating the automation url request context used by the host network stack implementation with a NULL AutomationResourceMessageFilter pointer. Fixes bug http://code.google.com/p/chromium/issues/detail?id=29025 Will add a test for this in a subsequent CL. Bug=29025 Review URL: http://codereview.chromium.org/506060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34880 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/external_tab_container.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'chrome/browser/external_tab_container.cc') diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc index 2775960..2897520 100644 --- a/chrome/browser/external_tab_container.cc +++ b/chrome/browser/external_tab_container.cc @@ -187,6 +187,8 @@ bool ExternalTabContainer::Reinitialize( automation_resource_message_filter_ = filter; if (load_requests_via_automation_) { + InitializeAutomationRequestContext(tab_handle_); + RenderViewHost* rvh = tab_contents_->render_view_host(); if (rvh) { AutomationResourceMessageFilter::RegisterRenderView( @@ -206,8 +208,9 @@ bool ExternalTabContainer::Reinitialize( void ExternalTabContainer::SetTabHandle(int handle) { tab_handle_ = handle; - if (load_requests_via_automation_) { - InitializeAutomationRequestContext(handle); + if (automation_resource_message_filter_.get() && + load_requests_via_automation_) { + InitializeAutomationRequestContext(tab_handle_); } } -- cgit v1.1