Fix a Chrome browser crash which is seen during chrome frame reliability test runs.Based on the c...

chrome/browser/automation/automation_resource_message_filter.cc

Index: chrome/browser/automation/automation_resource_message_filter.cc
===================================================================
--- chrome/browser/automation/automation_resource_message_filter.cc	(revision 90597)
+++ chrome/browser/automation/automation_resource_message_filter.cc	(working copy)
@@ -110,6 +110,7 @@
   int render_process_id;
   IPC::Message* reply_msg;
   scoped_refptr<net::CookieStore> cookie_store;
+  scoped_refptr<AutomationResourceMessageFilter> automation_message_filter;
 };
 
 AutomationResourceMessageFilter::AutomationResourceMessageFilter()
@@ -158,6 +159,18 @@
       index++;
     }
   }
+
+  CompletionCallbackMap::iterator callback_index =
+      completion_callback_map_.Get().begin();
+  while (callback_index != completion_callback_map_.Get().end()) {
+    const CookieCompletionInfo& cookie_completion_info =
+        (*callback_index).second;
+    if (cookie_completion_info.automation_message_filter.get() == this) {
+      completion_callback_map_.Get().erase(callback_index++);
+    } else {

[robertshield, 2011/06/28 18:28:35]

drop the else and increment callback_index only in a single location?

+      callback_index++;
+    }
+  }
 }
 
 // Called on the IPC thread:
@@ -468,6 +481,8 @@
   cookie_info.render_process_id = render_process_id;
   cookie_info.reply_msg = reply_msg;
   cookie_info.cookie_store = automation_details_iter->second.cookie_store_;
+  cookie_info.automation_message_filter =
+      automation_details_iter->second.filter;
 
   completion_callback_map_.Get()[completion_callback_id] = cookie_info;