Speculative fix for a bug that happens during Chrome Frame teardown while the...

chrome_frame/chrome_frame_automation.cc

 // Copyright (c) 2011 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_frame/chrome_frame_automation.h"
 
 #include "app/app_switches.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 380 matching lines @@
       launch_delegates_.end(), delegate);
   if (it == launch_delegates_.end()) {
     NOTREACHED();
   } else {
     if (launch_delegates_.size() == 1) {
       *was_last_delegate = true;
 
       if (snapshots_)
         SendUMAData();
 
-      // Take down the proxy since we no longer have any clients.
-      proxy_.reset(NULL);
-
       // Process pending notifications.
       thread_->message_loop()->RunAllPending();
+
+      // Take down the proxy since we no longer have any clients.
+      // Make sure we only do this once all pending messages have been cleared.
+      proxy_.reset(NULL);
     }
     // Be careful to remove from the list after running pending
     // tasks.  Otherwise the delegate being removed might miss out
     // on pending notifications such as LaunchComplete.
     launch_delegates_.erase(it);
   }
 
   done->Signal();
 }
 
@@ skipping 1044 matching lines @@
     const net::URLRequestStatus& status) {
   automation_server_->Send(new AutomationMsg_RequestEnd(
       tab_->handle(), request_id, status));
 }
 
 void ChromeFrameAutomationClient::OnCookiesRetrieved(bool success,
     const GURL& url, const std::string& cookie_string, int cookie_id) {
   automation_server_->Send(new AutomationMsg_GetCookiesHostResponse(
       tab_->handle(), success, url, cookie_string, cookie_id));
 }