Merge 54867 - ChromeFrame currently overrides the request context for interce...

chrome/browser/external_tab_container_win.cc

Index: chrome/browser/external_tab_container_win.cc
===================================================================
--- chrome/browser/external_tab_container_win.cc	(revision 56788)
+++ chrome/browser/external_tab_container_win.cc	(working copy)
@@ -221,10 +221,6 @@
 
 void ExternalTabContainer::SetTabHandle(int handle) {
   tab_handle_ = handle;
-  if (automation_resource_message_filter_.get() &&
-      load_requests_via_automation_) {
-    InitializeAutomationRequestContext(tab_handle_);
-  }
 }
 
 void ExternalTabContainer::ProcessUnhandledAccelerator(const MSG& msg) {
@@ -888,17 +884,6 @@
   return true;
 }
 
-void ExternalTabContainer::InitializeAutomationRequestContext(
-    int tab_handle) {
-  request_context_ =
-      AutomationRequestContext::CreateAutomationURLRequestContextForTab(
-          tab_handle, tab_contents_->profile(),
-          automation_resource_message_filter_);
-
-  DCHECK(request_context_.get() != NULL);
-  tab_contents_->set_request_context(request_context_.get());
-}
-
 void ExternalTabContainer::LoadAccelerators() {
   HACCEL accelerator_table = AtlLoadAccelerators(IDR_CHROMEFRAME);
   DCHECK(accelerator_table);
@@ -937,8 +922,6 @@
 
 void ExternalTabContainer::OnReinitialize() {
   if (load_requests_via_automation_) {
-    InitializeAutomationRequestContext(tab_handle_);
-
     RenderViewHost* rvh = tab_contents_->render_view_host();
     if (rvh) {
       AutomationResourceMessageFilter::ResumePendingRenderView(