| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
| 6 #include "chrome/browser/autofill/autofill_profile.h" | 6 #include "chrome/browser/autofill/autofill_profile.h" |
| 7 #include "chrome/browser/sync/profile_sync_service_harness.h" | 7 #include "chrome/browser/sync/profile_sync_service_harness.h" |
| 8 #include "chrome/browser/sync/test/integration/autofill_helper.h" | 8 #include "chrome/browser/sync/test/integration/autofill_helper.h" |
| 9 #include "chrome/browser/sync/test/integration/sync_test.h" | 9 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 10 #include "chrome/browser/webdata/autofill_entry.h" | 10 #include "chrome/browser/webdata/autofill_entry.h" |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 ASSERT_TRUE(ProfilesMatch(0, 1)); | 181 ASSERT_TRUE(ProfilesMatch(0, 1)); |
| 182 ASSERT_EQ(1U, GetAllProfiles(0).size()); | 182 ASSERT_EQ(1U, GetAllProfiles(0).size()); |
| 183 } | 183 } |
| 184 | 184 |
| 185 // TCM ID - 3636294. | 185 // TCM ID - 3636294. |
| 186 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, SameProfileWithConflict) { | 186 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, SameProfileWithConflict) { |
| 187 ASSERT_TRUE(SetupClients()) << "SetupClients() failed."; | 187 ASSERT_TRUE(SetupClients()) << "SetupClients() failed."; |
| 188 | 188 |
| 189 AutofillProfile profile0 = CreateAutofillProfile(PROFILE_HOMER); | 189 AutofillProfile profile0 = CreateAutofillProfile(PROFILE_HOMER); |
| 190 AutofillProfile profile1 = CreateAutofillProfile(PROFILE_HOMER); | 190 AutofillProfile profile1 = CreateAutofillProfile(PROFILE_HOMER); |
| 191 profile1.SetInfo(PHONE_FAX_WHOLE_NUMBER, ASCIIToUTF16("1234567890")); | 191 profile1.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("1234567890")); |
| 192 | 192 |
| 193 AddProfile(0, profile0); | 193 AddProfile(0, profile0); |
| 194 AddProfile(1, profile1); | 194 AddProfile(1, profile1); |
| 195 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 195 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 196 ASSERT_TRUE(AwaitQuiescence()); | 196 ASSERT_TRUE(AwaitQuiescence()); |
| 197 ASSERT_TRUE(ProfilesMatch(0, 1)); | 197 ASSERT_TRUE(ProfilesMatch(0, 1)); |
| 198 ASSERT_EQ(1U, GetAllProfiles(0).size()); | 198 ASSERT_EQ(1U, GetAllProfiles(0).size()); |
| 199 } | 199 } |
| 200 | 200 |
| 201 // TCM ID - 3626291. | 201 // TCM ID - 3626291. |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 AutofillType(EMAIL_ADDRESS), | 400 AutofillType(EMAIL_ADDRESS), |
| 401 exceeds_max_length_string); | 401 exceeds_max_length_string); |
| 402 UpdateProfile(0, | 402 UpdateProfile(0, |
| 403 GetAllProfiles(0)[0]->guid(), | 403 GetAllProfiles(0)[0]->guid(), |
| 404 AutofillType(ADDRESS_HOME_LINE1), | 404 AutofillType(ADDRESS_HOME_LINE1), |
| 405 exceeds_max_length_string); | 405 exceeds_max_length_string); |
| 406 | 406 |
| 407 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 407 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 408 ASSERT_FALSE(ProfilesMatch(0, 1)); | 408 ASSERT_FALSE(ProfilesMatch(0, 1)); |
| 409 } | 409 } |
| OLD | NEW |