[Autofill] No longer pass FormStructure pointers in ParseQueryResponse.

components/autofill/core/browser/autofill_manager.cc

 // Copyright 2013 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 "components/autofill/core/browser/autofill_manager.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
@@ skipping 724 matching lines @@
   if (!IsValidString16Vector(values) ||
       !IsValidString16Vector(labels) ||
       values.size() != labels.size())
     return;
 
   external_delegate_->SetCurrentDataListValues(values, labels);
 }
 
 void AutofillManager::OnLoadedServerPredictions(
     const std::string& response_xml,
-    const std::vector<FormStructure*>& queried_forms) {
+    const std::vector<std::string>& form_signatures) {
+  // We obtain the current valid FormStructures represented by
+  // |form_signatures|. We invert both lists because most recent forms are at
+  // the end of the list.
+  std::vector<FormStructure*> queried_forms;
+  for (const std::string& signature : base::Reversed(form_signatures)) {
+    for (FormStructure* cur_form : base::Reversed(form_structures_)) {
+      if (cur_form->FormSignature() == signature) {
+        queried_forms.push_back(cur_form);
+        continue;
+      }
+    }
+  }
+  // If there are no current forms corresponding to the queried signatures, drop
+  // the query response.
+  if (queried_forms.empty())
+    return;
+
   // Parse and store the server predictions.
   FormStructure::ParseQueryResponse(response_xml, queried_forms,
                                     client_->GetRapporService());
 
   // Forward form structures to the password generation manager to detect
   // account creation forms.
   driver_->PropagateAutofillPredictions(queried_forms);
 
   // If the corresponding flag is set, annotate forms with the predicted types.
   driver_->SendAutofillTypePredictionsToRenderer(queried_forms);
@@ skipping 861 matching lines @@
     if (i > 0)
       fputs("Next oldest form:\n", file);
   }
   fputs("\n", file);
 
   fclose(file);
 }
 #endif  // ENABLE_FORM_DEBUG_DUMP
 
 }  // namespace autofill