AutoFill DCHECK in RenderViewHost::AutocompleteSuggestionsReturned fails.

chrome/browser/renderer_host/render_view_host.cc

Index: chrome/browser/renderer_host/render_view_host.cc
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 28b44a35396d236a4f65fd4377f9915599eed87a..4905ad55d874ef15546019ad2c31e3456f9e8e02 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -1659,7 +1659,15 @@ void RenderViewHost::AutoFillSuggestionsReturned(
 
 void RenderViewHost::AutocompleteSuggestionsReturned(
     int query_id, const std::vector<string16>& suggestions) {
-  DCHECK_EQ(autofill_query_id_, query_id);
+  // When query ids match we are responding to an AutoFill and Autocomplete
+  // combined query response.
+  // Otherwise Autocomplete is cancelling, so we only send suggestions (usually
+  // an empty list).
+  if (autofill_query_id_ != query_id) {
+    // Autocomplete is cancelling.
+    autofill_values_.clear();
+    autofill_labels_.clear();
+  }
 
   // Combine AutoFill and Autocomplete values into values and labels.
   for (size_t i = 0; i < suggestions.size(); ++i) {