summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/external_tab_container.cc7
1 files changed, 5 insertions, 2 deletions
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_);
}
}