Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 7 insertions, 11 deletions

diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc
index a08794b..a1a83c5 100644
--- a/chrome/browser/autofill/autofill_download.cc
+++ b/chrome/browser/autofill/autofill_download.cc
@@ -71,15 +71,10 @@ bool AutoFillDownloadManager::StartQueryRequest(
     return false;
   }
   std::string form_xml;
-  FormStructure::EncodeQueryRequest(forms, &form_xml);
-
   FormRequestData request_data;
-  request_data.form_signatures.reserve(forms.size());
-  for (ScopedVector<FormStructure>::const_iterator it = forms.begin();
-       it != forms.end();
-       ++it) {
-    request_data.form_signatures.push_back((*it)->FormSignature());
-  }
+  if (!FormStructure::EncodeQueryRequest(forms, &request_data.form_signatures,
+                                         &form_xml))
+    return false;
 
   request_data.request_type = AutoFillDownloadManager::REQUEST_QUERY;
 
@@ -102,7 +97,8 @@ bool AutoFillDownloadManager::StartUploadRequest(
     return false;
   }
   std::string form_xml;
-  form.EncodeUploadRequest(form_was_matched, &form_xml);
+  if (!form.EncodeUploadRequest(form_was_matched, &form_xml))
+    return false;
 
   FormRequestData request_data;
   request_data.form_signatures.push_back(form.FormSignature());
@@ -238,8 +234,8 @@ void AutoFillDownloadManager::OnURLFetchComplete(const URLFetcher* source,
       }
     }
 
-    VLOG(1) << "AutoFillDownloadManager: " << type_of_request
-            << " request has failed with response" << response_code;
+    LOG(WARNING) << "AutoFillDownloadManager: " << type_of_request
+                 << " request has failed with response" << response_code;
     if (observer_) {
       observer_->OnHeuristicsRequestError(it->second.form_signatures[0],
                                           it->second.request_type,