We forgot to call Associate in case of local changes for autofill.

When a local profile is created we create the corresponding sync node and we need to associate the sync node with profile. We forgot to make the call and that is fixed in this cl.
BUG=68912, 69173
TEST= sync_integration_tests

Review URL: http://codereview.chromium.org/6323001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71409 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/sync/glue/autofill_profile_change_processor.cc

@@ -286,6 +286,9 @@ void AutofillProfileChangeProcessor::AddAutofillProfileSyncNode(
   node.SetTitle(UTF8ToWide(profile.guid()));
 
   WriteAutofillProfile(profile, &node);
+
+  std::string guid = profile.guid();
+  model_associator_->Associate(&guid, node.GetId());
 }
 
 void AutofillProfileChangeProcessor::StartObserving() {

chrome/test/live_sync/two_client_live_autofill_sync_test.cc

@@ -95,9 +95,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest,
   ASSERT_EQ(5U, GetAllKeys(0).size());
 }
 
-// TODO(lipalani): Enable after http://crbug.com/69173 is fixed.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest,
-                       DISABLED_PersonalDataManagerSanity) {
+                       PersonalDataManagerSanity) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Client0 adds a profile.
@@ -227,8 +226,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, MergeProfiles) {
 }
 
 // TestScribe ID - 426756.
-// TODO(lipalani): Enable after http://crbug.com/69173 is fixed.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, DISABLED_UpdateFields) {
+IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, UpdateFields) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));