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

chrome/browser/external_tab_container_win.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/external_tab_container_win.h"
 
 #include <string>
 
 #include "app/win_util.h"
 #include "base/i18n/rtl.h"
@@ skipping 203 matching lines @@
       external_method_factory_.NewRunnableMethod(
           &ExternalTabContainer::OnReinitialize));
 
   if (parent_window)
     SetParent(GetNativeView(), parent_window);
   return true;
 }
 
 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) {
   NativeWebKeyboardEvent keyboard_event(msg.hwnd, msg.message, msg.wParam,
                                         msg.lParam);
   unhandled_keyboard_event_handler_.HandleKeyboardEvent(keyboard_event,
                                                         focus_manager_);
 }
 
 void ExternalTabContainer::FocusThroughTabTraversal(
@@ skipping 643 matching lines @@
 bool ExternalTabContainer::OnGoToEntryOffset(int offset) {
   if (load_requests_via_automation_) {
     automation_->Send(new AutomationMsg_RequestGoToHistoryEntryOffset(
         0, tab_handle_, offset));
     return false;
   }
 
   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);
 
   // We have to copy the table to access its contents.
   int count = CopyAcceleratorTable(accelerator_table, 0, 0);
   if (count == 0) {
     // Nothing to do in that case.
     return;
   }
@@ skipping 18 matching lines @@
     accelerator_table_[accelerator] = accelerators[i].cmd;
 
     // Also register with the focus manager.
     if (focus_manager_)
       focus_manager_->RegisterAccelerator(accelerator, this);
   }
 }
 
 void ExternalTabContainer::OnReinitialize() {
   if (load_requests_via_automation_) {
-    InitializeAutomationRequestContext(tab_handle_);
-
     RenderViewHost* rvh = tab_contents_->render_view_host();
     if (rvh) {
       AutomationResourceMessageFilter::ResumePendingRenderView(
           rvh->process()->id(), rvh->routing_id(),
           tab_handle_, automation_resource_message_filter_);
     }
   }
 
   NavigationStateChanged(tab_contents_, 0);
   ServicePendingOpenURLRequests();
@@ skipping 40 matching lines @@
 
   layout->StartRow(0, 0);
   layout->AddView(info_bar_container);
   layout->StartRow(1, 0);
   layout->AddView(tab_contents_container_);
   SetContentsView(external_tab_view_);
   // Note that SetTabContents must be called after AddChildView is called
   tab_contents_container_->ChangeTabContents(tab_contents_);
 }