AutoFill Assert with AutoFillManager unique ids and Credit Card filling

chrome/browser/autofill/autofill_manager.h

Index: chrome/browser/autofill/autofill_manager.h
diff --git a/chrome/browser/autofill/autofill_manager.h b/chrome/browser/autofill/autofill_manager.h
index 14018850645d22ff19aafcd2d7553d993c7685c7..48a1ad9b9185e961b197b8a7a7387217041204b9 100644
--- a/chrome/browser/autofill/autofill_manager.h
+++ b/chrome/browser/autofill/autofill_manager.h
@@ -99,7 +99,7 @@ class AutoFillManager : public RenderViewHostDelegate::AutoFill,
   // 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
+  // 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
   // true, check for billing fields and append CC digits to the labels;
   // otherwise, regular profiles are returned for billing address fields.
@@ -163,6 +163,11 @@ class AutoFillManager : public RenderViewHostDelegate::AutoFill,
   // 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 TabContents hosting this AutoFillManager.
   // Weak reference.
   // May not be NULL.
@@ -186,6 +191,11 @@ class AutoFillManager : public RenderViewHostDelegate::AutoFill,
   // The InfoBar that asks for permission to store credit card information.
   scoped_ptr<AutoFillCCInfoBarDelegate> cc_infobar_;
 
+  friend class AutoFillManagerTest;
+  FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillCreditCardForm);
+  FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillNonBillingFormSemicolon);
+  FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillBillFormSemicolon);
+
   DISALLOW_COPY_AND_ASSIGN(AutoFillManager);
 };