AutoFill Assert with AutoFillManager unique ids and Credit Card filling

chrome/browser/autofill/autofill_manager_unittest.cc

Index: chrome/browser/autofill/autofill_manager_unittest.cc
diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc
index a7c8f3a37201b617bd85da9e7356c8e98813a380..7d46c04de227c6e5c25ba2e4736dd6ebf53d26cc 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -28,8 +28,6 @@
 
 using webkit_glue::FormData;
 
-namespace {
-
 typedef Tuple4<int,
                std::vector<string16>,
                std::vector<string16>,
@@ -731,7 +729,7 @@ TEST_F(AutoFillManagerTest, FillCreditCardForm) {
                                               form,
                                               string16(),
                                               ASCIIToUTF16("Home; *3456"),
-                                              1));
+                                              AutoFillManager::PackIDs(4, 1)));
 
   int page_id = 0;
   FormData results;
@@ -799,7 +797,7 @@ TEST_F(AutoFillManagerTest, FillNonBillingFormSemicolon) {
                                     "916 16th St.", "Apt. 6", "Lubbock",
                                     "Texas", "79401", "USA",
                                     "12345678901", "");
-  profile->set_unique_id(6);
+  profile->set_unique_id(7);
   autofill_manager_->AddProfile(profile);
 
   FormData form;
@@ -818,7 +816,7 @@ TEST_F(AutoFillManagerTest, FillNonBillingFormSemicolon) {
                                               form,
                                               string16(),
                                               ASCIIToUTF16("Home; 8765"),
-                                              6));
+                                              AutoFillManager::PackIDs(4, 7)));
 
   int page_id = 0;
   FormData results;
@@ -873,7 +871,7 @@ TEST_F(AutoFillManagerTest, FillBillFormSemicolon) {
                                     "916 16th St.", "Apt. 6", "Lubbock",
                                     "Texas", "79401", "USA",
                                     "12345678901", "");
-  profile->set_unique_id(6);
+  profile->set_unique_id(7);
   autofill_manager_->AddProfile(profile);
 
   FormData form;
@@ -888,7 +886,8 @@ TEST_F(AutoFillManagerTest, FillBillFormSemicolon) {
   // an IPC message back to the renderer.
   const int kPageID = 1;
   EXPECT_TRUE(autofill_manager_->FillAutoFillFormData(
-      kPageID, form, string16(), ASCIIToUTF16("Home; 8765; *3456"), 6));
+      kPageID, form, string16(), ASCIIToUTF16("Home; 8765; *3456"),
+      AutoFillManager::PackIDs(4, 7)));
 
   int page_id = 0;
   FormData results;
@@ -1212,5 +1211,3 @@ TEST_F(AutoFillManagerTest, AuxiliaryProfilesReset) {
       prefs::kAutoFillAuxiliaryProfilesEnabled));
 #endif
 }
-
-}  // namespace