Merge 56435 - AutoFillManagerTest.GetProfileSuggestionsEmptyValue crashes in ...

chrome/browser/autofill/autofill_manager.cc

 // Copyright (c) 2010 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 "chrome/browser/autofill/autofill_manager.h"
 
 #include <limits>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 80 matching lines @@
 
 }  // namespace
 
 // TODO(jhawkins): Maybe this should be in a grd file?
 const char* kAutoFillLearnMoreUrl =
     "http://www.google.com/support/chrome/bin/answer.py?answer=142893";
 
 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.
   personal_data_ =
       tab_contents_->profile()->GetOriginalProfile()->GetPersonalDataManager();
   download_manager_.SetObserver(this);
 }
 
 AutoFillManager::~AutoFillManager() {
   download_manager_.SetObserver(NULL);
@@ skipping 330 matching lines @@
 
   if (credit_card) {
     cc_infobar_.reset(new AutoFillCCInfoBarDelegate(tab_contents_, this));
   } else {
     UploadFormData();
   }
 }
 
 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) {
   if (should_save)
     personal_data_->SaveImportedCreditCard();
   UploadFormData();
 }
 
 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);
 }
 
 void AutoFillManager::GetProfileSuggestions(FormStructure* form,
                                             const FormField& field,
                                             AutoFillType type,
                                             bool include_cc_labels,
                                             std::vector<string16>* values,
                                             std::vector<string16>* labels,
                                             std::vector<string16>* icons,
@@ skipping 280 matching lines @@
        iter != forms.end(); ++iter) {
     FormStructure* form_structure = new FormStructure(*iter);
     if (!form_structure->ShouldBeParsed())
       continue;
 
     DeterminePossibleFieldTypes(form_structure);
     form_structures_.push_back(form_structure);
   }
 
   // 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_);
 }
 
 // When sending IDs (across processes) to the renderer we pack credit card and
 // profile IDs into a single integer.  Credit card IDs are sent in the high
 // word and profile IDs are sent in the low word.
 // static
 int AutoFillManager::PackIDs(int cc_id, int profile_id) {
   DCHECK(cc_id <= std::numeric_limits<unsigned short>::max());
   DCHECK(profile_id <= std::numeric_limits<unsigned short>::max());
 
   return cc_id << std::numeric_limits<unsigned short>::digits | profile_id;
 }
 
 // When receiving IDs (across processes) from the renderer we unpack credit card
 // and profile IDs from a single integer.  Credit card IDs are stored in the
 // high word and profile IDs are stored in the low word.
 // static
 void AutoFillManager::UnpackIDs(int id, int* cc_id, int* profile_id) {
   *cc_id = id >> std::numeric_limits<unsigned short>::digits &
       std::numeric_limits<unsigned short>::max();
   *profile_id = id & std::numeric_limits<unsigned short>::max();
 }