[Autofill] No longer pass FormStructure pointers in ParseQueryResponse.

components/autofill/core/browser/autofill_download_manager.cc

 // Copyright 2014 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_download_manager.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
@@ skipping 47 matching lines @@
 
 GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) {
   return GURL("https://clients1.google.com/tbproxy/af/" +
               RequestTypeToString(request_type) + "?client=" + kClientName);
 }
 
 }  // namespace
 
 struct AutofillDownloadManager::FormRequestData {
   std::vector<std::string> form_signatures;
-  std::vector<FormStructure*> queried_forms;
   RequestType request_type;
 };
 
 AutofillDownloadManager::AutofillDownloadManager(AutofillDriver* driver,
                                                  PrefService* pref_service,
                                                  Observer* observer)
     : driver_(driver),
       pref_service_(pref_service),
       observer_(observer),
       max_form_cache_size_(kMaxFormCacheSize),
@@ skipping 22 matching lines @@
   }
 
   // Do not send the request if it contains more fields than the server can
   // accept.
   if (CountActiveFieldsInForms(forms) > kMaxFieldsPerQueryRequest)
     return false;
 
   std::string form_xml;
   FormRequestData request_data;
   if (!FormStructure::EncodeQueryRequest(forms, &request_data.form_signatures,
-                                         &request_data.queried_forms,
                                          &form_xml)) {
     return false;
   }
 
   request_data.request_type = AutofillDownloadManager::REQUEST_QUERY;
   AutofillMetrics::LogServerQueryMetric(AutofillMetrics::QUERY_SENT);
 
   std::string query_data;
   if (CheckCacheForQueryRequest(request_data.form_signatures, &query_data)) {
     VLOG(1) << "AutofillDownloadManager: query request has been retrieved "
              << "from the cache, form signatures: "
              << GetCombinedSignature(request_data.form_signatures);
     observer_->OnLoadedServerPredictions(query_data,
-                                         request_data.queried_forms);
+                                         request_data.form_signatures);
     return true;
   }
 
   return StartRequest(form_xml, request_data);
 }
 
 bool AutofillDownloadManager::StartUploadRequest(
     const FormStructure& form,
     bool form_was_autofilled,
     const ServerFieldTypeSet& available_field_types,
@@ skipping 202 matching lines @@
                                     it->second.request_type,
                                     source->GetResponseCode());
   } else {
     std::string response_body;
     source->GetResponseAsString(&response_body);
     VLOG(1) << "AutofillDownloadManager: " << request_type
              << " request has succeeded with response body: " << response_body;
     if (it->second.request_type == AutofillDownloadManager::REQUEST_QUERY) {
       CacheQueryRequest(it->second.form_signatures, response_body);
       observer_->OnLoadedServerPredictions(response_body,
-                                           it->second.queried_forms);
+                                           it->second.form_signatures);
     } else {
       double new_positive_upload_rate = 0;
       double new_negative_upload_rate = 0;
       AutofillUploadXmlParser parse_handler(&new_positive_upload_rate,
                                             &new_negative_upload_rate);
       buzz::XmlParser parser(&parse_handler);
       parser.Parse(response_body.data(), response_body.length(), true);
       if (parse_handler.succeeded()) {
         SetPositiveUploadRate(new_positive_upload_rate);
         SetNegativeUploadRate(new_negative_upload_rate);
       }
 
       observer_->OnUploadedPossibleFieldTypes();
     }
   }
   delete it->first;
   url_fetchers_.erase(it);
 }
 
 }  // namespace autofill