Propagate correct data to the Toolbar servers

chrome/browser/autofill/personal_data_manager_unittest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
@@ skipping 261 matching lines @@
   update_cc.push_back(creditcard0);
   update_cc.push_back(creditcard1);
   personal_data_->SetCreditCards(&update_cc);
 
 
   const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
   ASSERT_EQ(2U, results2.size());
   EXPECT_EQ(creditcard0, *results2.at(0));
   EXPECT_EQ(creditcard1, *results2.at(1));
 
+  // The message loop will exit when the mock observer is notified.
+  MessageLoop::current()->Run();
+
   // Determine uniqueness by inserting all of the GUIDs into a set and verifying
   // the size of the set matches the number of GUIDs.
   std::set<std::string> guids;
   guids.insert(profile0.guid());
   guids.insert(profile1.guid());
   guids.insert(creditcard0.guid());
   guids.insert(creditcard1.guid());
   EXPECT_EQ(4U, guids.size());
 }
 
@@ skipping 23 matching lines @@
 
   // The message loop will exit when the PersonalDataLoadedObserver is notified.
   MessageLoop::current()->Run();
 
   // Verify that we've loaded the profiles from the web database.
   const std::vector<AutoFillProfile*>& results2 = personal_data_->profiles();
   ASSERT_EQ(1U, results2.size());
 
   // Add a new profile.
   AutoFillProfile profile1;
+  // Need to be different from results2[0] by contents or it will be dropped.
   autofill_test::SetProfileInfo(&profile1,
-      "", "y", "", "", "", "", "", "", "", "", "", "", "", "");
+      "", "y", "1", "", "", "", "", "", "", "", "", "", "", "");
   update.clear();
   update.push_back(*results2[0]);
   update.push_back(profile1);
   personal_data_->SetProfiles(&update);
 
+  // The message loop will exit when the PersonalDataLoadedObserver is notified.
+  MessageLoop::current()->Run();
+
   // Make sure the two profiles have different ids (and neither equal to 0,
   // which is an invalid id).
   const std::vector<AutoFillProfile*>& results3 = personal_data_->profiles();
   ASSERT_EQ(2U, results3.size());
   EXPECT_NE(results3[0]->guid(), results3[1]->guid());
   EXPECT_TRUE(guid::IsValidGUID(results3[0]->guid()));
   EXPECT_TRUE(guid::IsValidGUID(results3[1]->guid()));
 }
 
 TEST_F(PersonalDataManagerTest, SetEmptyProfile) {
@@ skipping 1038 matching lines @@
 
   // Expect that the newer information is saved.  In this case the year is
   // added to the existing credit card.
   CreditCard expected2;
   autofill_test::SetCreditCardInfo(&expected2,
       "L1", "Biggie Smalls", "4111111111111111", "01", "2011");
   const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
   ASSERT_EQ(1U, results2.size());
   EXPECT_EQ(0, expected2.Compare(*results2[0]));
 }
+