Merge 56435 - AutoFillManagerTest.GetProfileSuggestionsEmptyValue crashes in ...

chrome/browser/autofill/autofill_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 
 #include <vector>
 #include <string>
 
@@ skipping 72 matching lines @@
   void HandleSubmit();
 
   // Uploads the form data to the AutoFill server.
   void UploadFormData();
 
  protected:
   // For tests.
   AutoFillManager();
   AutoFillManager(TabContents* tab_contents,
                   PersonalDataManager* personal_data);
+
   void set_personal_data_manager(PersonalDataManager* personal_data) {
     personal_data_ = personal_data;
   }
 
  private:
   // Returns a list of values from the stored profiles that match |type| and the
   // value of |field| and returns the labels of the matching profiles. |labels|
   // is filled with the Profile label and possibly the last four digits of a
   // corresponding credit card: 'Home; *1258' - Home is the Profile label and
   // 1258 is the last four digits of the credit card. If |include_cc_labels| is
@@ skipping 60 matching lines @@
                             webkit_glue::FormField* field);
 
   // Parses the forms using heuristic matching and querying the AutoFill server.
   void ParseForms(const std::vector<webkit_glue::FormData>& forms);
 
   // Methods for packing and unpacking credit card and profile IDs for sending
   // and receiving to and from the renderer process.
   static int PackIDs(int cc_id, int profile_id);
   static void UnpackIDs(int id, int* cc_id, int* profile_id);
 
+  // The following function is meant to be called from unit-test only.
+  void set_disable_download_manager_requests(bool value) {
+    disable_download_manager_requests_ = value;
+  }
+
   // The TabContents hosting this AutoFillManager.
   // Weak reference.
   // May not be NULL.
   TabContents* tab_contents_;
 
   // The personal data manager, used to save and load personal data to/from the
   // web database.  This is overridden by the AutoFillManagerTest.
   // Weak reference.
   // May be NULL.  NULL indicates OTR.
   PersonalDataManager* personal_data_;
 
   // Handles queries and uploads to AutoFill servers.
   AutoFillDownloadManager download_manager_;
 
+  // Should be set to true in AutoFillManagerTest and other tests, false in
+  // AutoFillDownloadManagerTest and in non-test environment. Is false by
+  // default.
+  bool disable_download_manager_requests_;
+
   // Our copy of the form data.
   ScopedVector<FormStructure> form_structures_;
 
   // The form data the user has submitted.
   scoped_ptr<FormStructure> upload_form_structure_;
 
   // The InfoBar that asks for permission to store credit card information.
   scoped_ptr<AutoFillCCInfoBarDelegate> cc_infobar_;
 
-  friend class AutoFillManagerTest;
+  friend class TestAutoFillManager;
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillCreditCardForm);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillNonBillingFormSemicolon);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillBillFormSemicolon);
 
   DISALLOW_COPY_AND_ASSIGN(AutoFillManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_