Fix a crash in ChromeFrame caused by incorrectly instantiating the automation...

chrome/browser/external_tab_container.cc

 // Copyright (c) 2006-2008 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.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/win_util.h"
@@ skipping 169 matching lines @@
     AutomationResourceMessageFilter* filter) {
   if (!automation_provider || !filter) {
     NOTREACHED();
     return false;
   }
 
   automation_ = automation_provider;
   automation_resource_message_filter_ = filter;
 
   if (load_requests_via_automation_) {
+    InitializeAutomationRequestContext(tab_handle_);
+
     RenderViewHost* rvh = tab_contents_->render_view_host();
     if (rvh) {
       AutomationResourceMessageFilter::RegisterRenderView(
           rvh->process()->id(), rvh->routing_id(),
           tab_handle_, automation_resource_message_filter_);
     }
   }
 
   // We cannot send the navigation state right away as the automation channel
   // may not have been fully setup yet.
   MessageLoop::current()->PostTask(
       FROM_HERE,
       external_method_factory_.NewRunnableMethod(
           &ExternalTabContainer::NavigationStateChanged, tab_contents_, 0));
   return true;
 }
 
 void ExternalTabContainer::SetTabHandle(int handle) {
   tab_handle_ = handle;
-  if (load_requests_via_automation_) {
-    InitializeAutomationRequestContext(handle);
-  }
 }
 
 void ExternalTabContainer::ProcessUnhandledAccelerator(const MSG& msg) {
   DefWindowProc(msg.hwnd, msg.message, msg.wParam, msg.lParam);
 }
 
 void ExternalTabContainer::FocusThroughTabTraversal(bool reverse) {
   DCHECK(tab_contents_);
   if (tab_contents_) {
     static_cast<TabContents*>(tab_contents_)->Focus();
@@ skipping 490 matching lines @@
 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());
 }