Merge 56435 - AutoFillManagerTest.GetProfileSuggestionsEmptyValue crashes in ...

chrome/browser/autofill/autofill_manager.cc

Index: chrome/browser/autofill/autofill_manager.cc
===================================================================
--- chrome/browser/autofill/autofill_manager.cc	(revision 56552)
+++ chrome/browser/autofill/autofill_manager.cc	(working copy)
@@ -98,7 +98,8 @@
 AutoFillManager::AutoFillManager(TabContents* tab_contents)
     : tab_contents_(tab_contents),
       personal_data_(NULL),
-      download_manager_(tab_contents_->profile()) {
+      download_manager_(tab_contents_->profile()),
+      disable_download_manager_requests_(false) {
   DCHECK(tab_contents);
 
   // |personal_data_| is NULL when using TestTabContents.
@@ -449,9 +450,10 @@
 
 void AutoFillManager::UploadFormData() {
   // TODO(georgey): enable upload request when we make sure that our data is in
-  // line with toolbar data:
-  // download_manager_.StartUploadRequest(upload_form_structure_,
-  //                                      form_is_autofilled);
+  // line with toolbar data (bug #52501):
+  // if (!disable_download_manager_requests_)
+  //   download_manager_.StartUploadRequest(upload_form_structure_,
+  //                                        form_is_autofilled);
 }
 
 void AutoFillManager::OnInfoBarClosed(bool should_save) {
@@ -463,14 +465,16 @@
 AutoFillManager::AutoFillManager()
     : tab_contents_(NULL),
       personal_data_(NULL),
-      download_manager_(NULL) {
+      download_manager_(NULL),
+      disable_download_manager_requests_(false) {
 }
 
 AutoFillManager::AutoFillManager(TabContents* tab_contents,
                                  PersonalDataManager* personal_data)
     : tab_contents_(tab_contents),
       personal_data_(personal_data),
-      download_manager_(NULL) {
+      download_manager_(NULL),
+      disable_download_manager_requests_(false) {
   DCHECK(tab_contents);
 }
 
@@ -771,7 +775,7 @@
   }
 
   // If none of the forms were parsed, no use querying the server.
-  if (!form_structures_.empty())
+  if (!form_structures_.empty() && !disable_download_manager_requests_)
     download_manager_.StartQueryRequest(form_structures_);
 }