Skip to content

GitLab

T
tangled
Commit 0d91c6b9 authored by Matthias Körber's avatar Matthias Körber Committed by Commit Bot
Browse files
Options

[Autofill][Slimshady] BridgeUtils merging and tests for structured names 

Adds logic to merge the names stored in a local and remote profile.
Adepts the bridge util tests to work with structured names.

Change-Id: Ide42931f3f36809b9f72a666e2941ce1418f040d
Bug: 1099202
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2358672
Commit-Queue: Matthias Körber <koerber@google.com>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798703}
parent 9af7e14d
Hide whitespace changes
Inline Side-by-side
Showing with 318 additions and 135 deletions
components/autofill/core/browser/data_model/autofill_profile.cc
View file @ 0d91c6b9
...@@ -568,7 +568,18 @@ void AutofillProfile::OverwriteDataFrom(const AutofillProfile& profile) { ...@@ -568,7 +568,18 @@ void AutofillProfile::OverwriteDataFrom(const AutofillProfile& profile) {
// values. // values.
std::string language_code_value = language_code(); std::string language_code_value = language_code();
std::string origin_value = origin(); std::string origin_value = origin();
base::string16 name_full_value = GetRawInfo(NAME_FULL);
// Structured names should not be simply overwritten but it should be
// attempted to merge the names.
bool use_structured_name = base::FeatureList::IsEnabled(
features::kAutofillEnableSupportForMoreStructureInNames);
bool is_structured_name_mergeable = false;
NameInfo name_info = GetNameInfo();
if (use_structured_name) {
is_structured_name_mergeable =
name_info.IsStructuredNameMergeable(profile.GetNameInfo());
name_info.MergeStructuredName(profile.GetNameInfo());
}
*this = profile; *this = profile;
...@@ -576,8 +587,23 @@ void AutofillProfile::OverwriteDataFrom(const AutofillProfile& profile) { ...@@ -576,8 +587,23 @@ void AutofillProfile::OverwriteDataFrom(const AutofillProfile& profile) {
set_origin(origin_value); set_origin(origin_value);
if (language_code().empty()) if (language_code().empty())
set_language_code(language_code_value); set_language_code(language_code_value);
if (!HasRawInfo(NAME_FULL))
SetRawInfo(NAME_FULL, name_full_value); // For structured names, use the merged name if possible.
if (is_structured_name_mergeable) {
name_ = name_info;
return;
}
// For structured names, if the full name of |profile| is empty, maintain the
// complete name structure. Note, this should only happen if the complete name
// is empty. For the legacy implementation, set the full name if |profile|
// does not contain a full name.
if (!HasRawInfo(NAME_FULL)) {
if (use_structured_name) {
name_ = name_info;
} else {
SetRawInfo(NAME_FULL, name_info.GetRawInfo(NAME_FULL));
}
}
} }
bool AutofillProfile::MergeDataFrom(const AutofillProfile& profile, bool AutofillProfile::MergeDataFrom(const AutofillProfile& profile,
...@@ -1209,31 +1235,53 @@ bool AutofillProfile::EqualsSansGuid(const AutofillProfile& profile) const { ...@@ -1209,31 +1235,53 @@ bool AutofillProfile::EqualsSansGuid(const AutofillProfile& profile) const {
} }
std::ostream& operator<<(std::ostream& os, const AutofillProfile& profile) { std::ostream& operator<<(std::ostream& os, const AutofillProfile& profile) {
return os << (profile.record_type() == AutofillProfile::LOCAL_PROFILE return os
? profile.guid() << (profile.record_type() == AutofillProfile::LOCAL_PROFILE
: base::HexEncode(profile.server_id().data(), ? profile.guid()
profile.server_id().size())) : base::HexEncode(profile.server_id().data(),
<< " " << profile.origin() << " " profile.server_id().size()))
<< UTF16ToUTF8(profile.GetRawInfo(NAME_FULL)) << " " << " " << profile.origin() << " "
<< UTF16ToUTF8(profile.GetRawInfo(NAME_FIRST)) << " " << UTF16ToUTF8(profile.GetRawInfo(NAME_FULL)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(NAME_MIDDLE)) << " " << "("
<< UTF16ToUTF8(profile.GetRawInfo(NAME_LAST)) << " " << base::NumberToString(profile.GetVerificationStatusInt(NAME_FULL))
<< UTF16ToUTF8(profile.GetRawInfo(EMAIL_ADDRESS)) << " " << ") " << UTF16ToUTF8(profile.GetRawInfo(NAME_FIRST)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(COMPANY_NAME)) << " " << "("
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_LINE1)) << " " << base::NumberToString(profile.GetVerificationStatusInt(NAME_FIRST))
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_LINE2)) << " " << ") " << UTF16ToUTF8(profile.GetRawInfo(NAME_MIDDLE)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_LINE3)) << " " << "("
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY)) << base::NumberToString(profile.GetVerificationStatusInt(NAME_MIDDLE))
<< " " << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_CITY)) << " " << ") " << UTF16ToUTF8(profile.GetRawInfo(NAME_LAST)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STATE)) << " " << "("
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_ZIP)) << " " << base::NumberToString(profile.GetVerificationStatusInt(NAME_LAST))
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE)) << " " << ") " << UTF16ToUTF8(profile.GetRawInfo(NAME_LAST_FIRST)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY)) << " " << "("
<< profile.language_code() << " " << base::NumberToString(
<< UTF16ToUTF8(profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER)) << " " profile.GetVerificationStatusInt(NAME_LAST_FIRST))
<< profile.GetClientValidityBitfieldValue() << " " << ") " << UTF16ToUTF8(profile.GetRawInfo(NAME_LAST_CONJUNCTION))
<< profile.has_converted() << " " << profile.use_count() << " " << " "
<< profile.use_date(); << "("
<< base::NumberToString(
profile.GetVerificationStatusInt(NAME_LAST_CONJUNCTION))
<< ") " << UTF16ToUTF8(profile.GetRawInfo(NAME_LAST_SECOND)) << " "
<< "("
<< base::NumberToString(
profile.GetVerificationStatusInt(NAME_LAST_SECOND))
<< ") " << UTF16ToUTF8(profile.GetRawInfo(EMAIL_ADDRESS)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(COMPANY_NAME)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_LINE1)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_LINE2)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_LINE3)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY))
<< " " << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_CITY)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STATE)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_ZIP)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE)) << " "
<< UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY)) << " "
<< profile.language_code() << " "
<< UTF16ToUTF8(profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER)) << " "
<< profile.GetClientValidityBitfieldValue() << " "
<< profile.has_converted() << " " << profile.use_count() << " "
<< profile.use_date();
} }
bool AutofillProfile::FinalizeAfterImport() { bool AutofillProfile::FinalizeAfterImport() {
......
components/autofill/core/browser/webdata/autofill_profile_sync_bridge_unittest.cc
View file @ 0d91c6b9
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/feature_list.h"
#include "base/files/scoped_temp_dir.h" #include "base/files/scoped_temp_dir.h"
#include "base/guid.h" #include "base/guid.h"
#include "base/location.h" #include "base/location.h"
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/test/bind_test_util.h" #include "base/test/bind_test_util.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h" #include "base/test/task_environment.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "components/autofill/core/browser/autofill_profile_sync_util.h" #include "components/autofill/core/browser/autofill_profile_sync_util.h"
...@@ -28,6 +30,7 @@ ...@@ -28,6 +30,7 @@
#include "components/autofill/core/browser/webdata/autofill_table.h" #include "components/autofill/core/browser/webdata/autofill_table.h"
#include "components/autofill/core/browser/webdata/mock_autofill_webdata_backend.h" #include "components/autofill/core/browser/webdata/mock_autofill_webdata_backend.h"
#include "components/autofill/core/common/autofill_constants.h" #include "components/autofill/core/common/autofill_constants.h"
#include "components/autofill/core/common/autofill_features.h"
#include "components/sync/base/client_tag_hash.h" #include "components/sync/base/client_tag_hash.h"
#include "components/sync/model/data_batch.h" #include "components/sync/model/data_batch.h"
#include "components/sync/model/data_type_activation_request.h" #include "components/sync/model/data_type_activation_request.h"
...@@ -259,10 +262,10 @@ AutofillProfileSpecifics ConstructCompleteSpecifics() { ...@@ -259,10 +262,10 @@ AutofillProfileSpecifics ConstructCompleteSpecifics() {
} // namespace } // namespace
class AutofillProfileSyncBridgeTest : public testing::Test { class AutofillProfileSyncBridgeTestBase : public testing::Test {
public: public:
AutofillProfileSyncBridgeTest() {} AutofillProfileSyncBridgeTestBase() = default;
~AutofillProfileSyncBridgeTest() override {} ~AutofillProfileSyncBridgeTestBase() override = default;
void SetUp() override { void SetUp() override {
// Fix a time for implicitly constructed use_dates in AutofillProfile. // Fix a time for implicitly constructed use_dates in AutofillProfile.
...@@ -374,10 +377,40 @@ class AutofillProfileSyncBridgeTest : public testing::Test { ...@@ -374,10 +377,40 @@ class AutofillProfileSyncBridgeTest : public testing::Test {
std::unique_ptr<syncer::ClientTagBasedModelTypeProcessor> real_processor_; std::unique_ptr<syncer::ClientTagBasedModelTypeProcessor> real_processor_;
std::unique_ptr<AutofillProfileSyncBridge> bridge_; std::unique_ptr<AutofillProfileSyncBridge> bridge_;
DISALLOW_COPY_AND_ASSIGN(AutofillProfileSyncBridgeTest); DISALLOW_COPY_AND_ASSIGN(AutofillProfileSyncBridgeTestBase);
}; };
TEST_F(AutofillProfileSyncBridgeTest, AutofillProfileChanged_Added) { // This class performs the sync bridge test with and without structured names
// enabled.
class AutofillProfileSyncBridgeTest : public AutofillProfileSyncBridgeTestBase,
public testing::WithParamInterface<bool> {
public:
void SetUp() override {
InitializeFeatures();
AutofillProfileSyncBridgeTestBase::SetUp();
}
void InitializeFeatures() {
bool structured_names_enabled = GetParam();
if (structured_names_enabled) {
scoped_features_.InitAndEnableFeature(
features::kAutofillEnableSupportForMoreStructureInNames);
} else {
scoped_features_.InitAndDisableFeature(
features::kAutofillEnableSupportForMoreStructureInNames);
}
}
bool UsingStructuredNames() const {
return base::FeatureList::IsEnabled(
features::kAutofillEnableSupportForMoreStructureInNames);
}
private:
base::test::ScopedFeatureList scoped_features_;
};
TEST_P(AutofillProfileSyncBridgeTest, AutofillProfileChanged_Added) {
StartSyncing({}); StartSyncing({});
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
...@@ -395,7 +428,7 @@ TEST_F(AutofillProfileSyncBridgeTest, AutofillProfileChanged_Added) { ...@@ -395,7 +428,7 @@ TEST_F(AutofillProfileSyncBridgeTest, AutofillProfileChanged_Added) {
} }
// Language code in autofill profiles should be synced to the server. // Language code in autofill profiles should be synced to the server.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
AutofillProfileChanged_Added_LanguageCodePropagates) { AutofillProfileChanged_Added_LanguageCodePropagates) {
StartSyncing({}); StartSyncing({});
...@@ -414,7 +447,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -414,7 +447,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
} }
// Validity state bitfield in autofill profiles should be synced to the server. // Validity state bitfield in autofill profiles should be synced to the server.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
AutofillProfileChanged_Added_LocalValidityBitfieldPropagates) { AutofillProfileChanged_Added_LocalValidityBitfieldPropagates) {
StartSyncing({}); StartSyncing({});
...@@ -433,7 +466,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -433,7 +466,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
} }
// Local updates should be properly propagated to the server. // Local updates should be properly propagated to the server.
TEST_F(AutofillProfileSyncBridgeTest, AutofillProfileChanged_Updated) { TEST_P(AutofillProfileSyncBridgeTest, AutofillProfileChanged_Updated) {
StartSyncing({}); StartSyncing({});
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
...@@ -451,7 +484,7 @@ TEST_F(AutofillProfileSyncBridgeTest, AutofillProfileChanged_Updated) { ...@@ -451,7 +484,7 @@ TEST_F(AutofillProfileSyncBridgeTest, AutofillProfileChanged_Updated) {
} }
// Usage stats should be updated by the client. // Usage stats should be updated by the client.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
AutofillProfileChanged_Updated_UsageStatsOverwrittenByClient) { AutofillProfileChanged_Updated_UsageStatsOverwrittenByClient) {
// Remote data has a profile with usage stats. // Remote data has a profile with usage stats.
AutofillProfileSpecifics remote = AutofillProfileSpecifics remote =
...@@ -482,7 +515,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -482,7 +515,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
} }
// Server profile updates should be ignored. // Server profile updates should be ignored.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
AutofillProfileChanged_Updated_IgnoreServerProfiles) { AutofillProfileChanged_Updated_IgnoreServerProfiles) {
StartSyncing({}); StartSyncing({});
...@@ -495,7 +528,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -495,7 +528,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
bridge()->AutofillProfileChanged(change); bridge()->AutofillProfileChanged(change);
} }
TEST_F(AutofillProfileSyncBridgeTest, AutofillProfileChanged_Deleted) { TEST_P(AutofillProfileSyncBridgeTest, AutofillProfileChanged_Deleted) {
StartSyncing({}); StartSyncing({});
AutofillProfile local(kGuidB, kHttpsOrigin); AutofillProfile local(kGuidB, kHttpsOrigin);
...@@ -510,7 +543,7 @@ TEST_F(AutofillProfileSyncBridgeTest, AutofillProfileChanged_Deleted) { ...@@ -510,7 +543,7 @@ TEST_F(AutofillProfileSyncBridgeTest, AutofillProfileChanged_Deleted) {
} }
// Server profile updates should be ignored. // Server profile updates should be ignored.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
AutofillProfileChanged_Deleted_IgnoreServerProfiles) { AutofillProfileChanged_Deleted_IgnoreServerProfiles) {
StartSyncing({}); StartSyncing({});
...@@ -523,7 +556,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -523,7 +556,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
bridge()->AutofillProfileChanged(change); bridge()->AutofillProfileChanged(change);
} }
TEST_F(AutofillProfileSyncBridgeTest, GetAllDataForDebugging) { TEST_P(AutofillProfileSyncBridgeTest, GetAllDataForDebugging) {
AutofillProfile local1 = AutofillProfile(kGuidA, kHttpsOrigin); AutofillProfile local1 = AutofillProfile(kGuidA, kHttpsOrigin);
local1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John")); local1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
local1.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("1 1st st")); local1.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("1 1st st"));
...@@ -535,7 +568,7 @@ TEST_F(AutofillProfileSyncBridgeTest, GetAllDataForDebugging) { ...@@ -535,7 +568,7 @@ TEST_F(AutofillProfileSyncBridgeTest, GetAllDataForDebugging) {
EXPECT_THAT(GetAllLocalData(), UnorderedElementsAre(local1, local2)); EXPECT_THAT(GetAllLocalData(), UnorderedElementsAre(local1, local2));
} }
TEST_F(AutofillProfileSyncBridgeTest, GetData) { TEST_P(AutofillProfileSyncBridgeTest, GetData) {
AutofillProfile local1 = AutofillProfile(kGuidA, kHttpsOrigin); AutofillProfile local1 = AutofillProfile(kGuidA, kHttpsOrigin);
local1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John")); local1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
local1.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("1 1st st")); local1.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("1 1st st"));
...@@ -558,25 +591,35 @@ TEST_F(AutofillProfileSyncBridgeTest, GetData) { ...@@ -558,25 +591,35 @@ TEST_F(AutofillProfileSyncBridgeTest, GetData) {
EXPECT_THAT(data, ElementsAre(local1)); EXPECT_THAT(data, ElementsAre(local1));
} }
TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData) { TEST_P(AutofillProfileSyncBridgeTest, MergeSyncData) {
AutofillProfile local1 = AutofillProfile(kGuidA, kHttpOrigin); AutofillProfile local1 = AutofillProfile(kGuidA, kHttpOrigin);
local1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John")); local1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
local1.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("1 1st st")); local1.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("1 1st st"));
AutofillProfile local2 = AutofillProfile(kGuidB, std::string()); AutofillProfile local2 = AutofillProfile(kGuidB, std::string());
local2.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom")); local2.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom"));
local2.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("2 2nd st")); local2.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("2 2nd st"));
AddAutofillProfilesToTable({local1, local2}); AddAutofillProfilesToTable({local1, local2});
AutofillProfileSpecifics remote1 = AutofillProfile remote1 = AutofillProfile(kGuidC, kHttpOrigin);
CreateAutofillProfileSpecifics(kGuidC, kHttpsOrigin); remote1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Jane"));
remote1.add_name_first("Jane"); remote1.FinalizeAfterImport();
AutofillProfileSpecifics remote2 =
CreateAutofillProfileSpecifics(kGuidD, kSettingsOrigin); AutofillProfile remote2 = AutofillProfile(kGuidD, kSettingsOrigin);
remote2.add_name_first("Harry"); remote2.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Harry"));
// This one will have the name and origin updated. remote2.FinalizeAfterImport();
AutofillProfileSpecifics remote3 =
CreateAutofillProfileSpecifics(kGuidB, kSettingsOrigin); AutofillProfile remote3 = AutofillProfile(kGuidB, kSettingsOrigin);
remote3.add_name_first("Tom Doe"); remote3.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom Doe"));
remote3.FinalizeAfterImport();
AutofillProfileSpecifics remote1_specifics =
CreateAutofillProfileSpecifics(remote1);
AutofillProfileSpecifics remote2_specifics =
CreateAutofillProfileSpecifics(remote2);
AutofillProfileSpecifics remote3_specifics =
CreateAutofillProfileSpecifics(remote3);
EXPECT_CALL( EXPECT_CALL(
mock_processor(), mock_processor(),
...@@ -584,17 +627,20 @@ TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData) { ...@@ -584,17 +627,20 @@ TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData) {
EXPECT_CALL(mock_processor(), Delete(_, _)).Times(0); EXPECT_CALL(mock_processor(), Delete(_, _)).Times(0);
EXPECT_CALL(*backend(), CommitChanges()); EXPECT_CALL(*backend(), CommitChanges());
StartSyncing({remote1, remote2, remote3}); StartSyncing({remote1_specifics, remote2_specifics, remote3_specifics});
EXPECT_THAT(GetAllLocalData(), // Since |local2| and |remote3| have the same GUID, data from |remote3| is
UnorderedElementsAre(local1, CreateAutofillProfile(remote1), // incorporated into the local profile which is mostly a replace operation.
CreateAutofillProfile(remote2), EXPECT_THAT(
CreateAutofillProfile(remote3))); GetAllLocalData(),
UnorderedElementsAre(local1, CreateAutofillProfile(remote1_specifics),
CreateAutofillProfile(remote2_specifics),
CreateAutofillProfile(remote3_specifics)));
} }
// Ensure that all profile fields are able to be synced up from the client to // Ensure that all profile fields are able to be synced up from the client to
// the server. // the server.
TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData_SyncAllFieldsToServer) { TEST_P(AutofillProfileSyncBridgeTest, MergeSyncData_SyncAllFieldsToServer) {
AutofillProfile local = ConstructCompleteProfile(); AutofillProfile local = ConstructCompleteProfile();
AddAutofillProfilesToTable({local}); AddAutofillProfilesToTable({local});
...@@ -611,7 +657,7 @@ TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData_SyncAllFieldsToServer) { ...@@ -611,7 +657,7 @@ TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData_SyncAllFieldsToServer) {
// Ensure that all profile fields are able to be synced down from the server to // Ensure that all profile fields are able to be synced down from the server to
// the client (and nothing gets uploaded back). // the client (and nothing gets uploaded back).
TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData_SyncAllFieldsToClient) { TEST_P(AutofillProfileSyncBridgeTest, MergeSyncData_SyncAllFieldsToClient) {
EXPECT_CALL(mock_processor(), Put(_, _, _)).Times(0); EXPECT_CALL(mock_processor(), Put(_, _, _)).Times(0);
EXPECT_CALL(*backend(), CommitChanges()); EXPECT_CALL(*backend(), CommitChanges());
StartSyncing({ConstructCompleteSpecifics()}); StartSyncing({ConstructCompleteSpecifics()});
...@@ -620,41 +666,50 @@ TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData_SyncAllFieldsToClient) { ...@@ -620,41 +666,50 @@ TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData_SyncAllFieldsToClient) {
ElementsAre(WithUsageStats(ConstructCompleteProfile()))); ElementsAre(WithUsageStats(ConstructCompleteProfile())));
} }
TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData_IdenticalProfiles) { TEST_P(AutofillProfileSyncBridgeTest, MergeSyncData_IdenticalProfiles) {
AutofillProfile local1 = AutofillProfile(kGuidA, kHttpOrigin); AutofillProfile local1 = AutofillProfile(kGuidA, kHttpOrigin);
local1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John")); local1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
local1.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("1 1st st")); local1.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("1 1st st"));
AutofillProfile local2 = AutofillProfile(kGuidB, kSettingsOrigin); AutofillProfile local2 = AutofillProfile(kGuidB, kSettingsOrigin);
local2.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom")); local2.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom"));
local2.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("2 2nd st")); local2.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("2 2nd st"));
AddAutofillProfilesToTable({local1, local2}); AddAutofillProfilesToTable({local1, local2});
// The synced profiles are identical to the local ones, except that the guids // The synced profiles are identical to the local ones, except that the guids
// are different. // are different.
AutofillProfileSpecifics remote1 =
CreateAutofillProfileSpecifics(kGuidC, kHttpsOrigin); AutofillProfile remote1 = AutofillProfile(kGuidC, kHttpsOrigin);
remote1.add_name_first("John"); remote1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
remote1.set_address_home_street_address("1 1st st"); remote1.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("1 1st st"));
AutofillProfileSpecifics remote2 = remote1.FinalizeAfterImport();
CreateAutofillProfileSpecifics(kGuidD, kHttpsOrigin);
remote2.add_name_first("Tom"); AutofillProfile remote2 = AutofillProfile(kGuidD, kHttpsOrigin);
remote2.set_address_home_street_address("2 2nd st"); remote2.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom"));
remote2.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("2 2nd st"));
remote2.FinalizeAfterImport();
AutofillProfileSpecifics remote1_specifics =
CreateAutofillProfileSpecifics(remote1);
AutofillProfileSpecifics remote2_specifics =
CreateAutofillProfileSpecifics(remote2);
// Both remote profiles win, only the verified origin is taken over for the // Both remote profiles win, only the verified origin is taken over for the
// second profile. // second profile.
AutofillProfileSpecifics merged2(remote2); AutofillProfileSpecifics merged2(remote2_specifics);
merged2.set_origin(kSettingsOrigin); merged2.set_origin(kSettingsOrigin);
EXPECT_CALL(mock_processor(), Put(kGuidD, HasSpecifics(merged2), _)); EXPECT_CALL(mock_processor(), Put(kGuidD, HasSpecifics(merged2), _));
EXPECT_CALL(*backend(), CommitChanges()); EXPECT_CALL(*backend(), CommitChanges());
StartSyncing({remote1, remote2}); StartSyncing({remote1_specifics, remote2_specifics});
EXPECT_THAT(GetAllLocalData(), EXPECT_THAT(GetAllLocalData(),
UnorderedElementsAre(CreateAutofillProfile(remote1), UnorderedElementsAre(CreateAutofillProfile(remote1_specifics),
CreateAutofillProfile(merged2))); CreateAutofillProfile(merged2)));
} }
TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData_NonSimilarProfiles) { TEST_P(AutofillProfileSyncBridgeTest, MergeSyncData_NonSimilarProfiles) {
AutofillProfile local = ConstructCompleteProfile(); AutofillProfile local = ConstructCompleteProfile();
local.set_guid(kGuidA); local.set_guid(kGuidA);
local.SetRawInfo(NAME_FULL, ASCIIToUTF16("John K. Doe, Jr.")); local.SetRawInfo(NAME_FULL, ASCIIToUTF16("John K. Doe, Jr."));
...@@ -687,39 +742,57 @@ TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData_NonSimilarProfiles) { ...@@ -687,39 +742,57 @@ TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData_NonSimilarProfiles) {
UnorderedElementsAre(local, CreateAutofillProfile(remote))); UnorderedElementsAre(local, CreateAutofillProfile(remote)));
} }
TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData_SimilarProfiles) { TEST_P(AutofillProfileSyncBridgeTest, MergeSyncData_SimilarProfiles) {
AutofillProfile local1 = AutofillProfile(kGuidA, kHttpOrigin); AutofillProfile local1 = AutofillProfile(kGuidA, kHttpOrigin);
local1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John")); local1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
local1.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("1 1st st")); local1.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("1 1st st"));
local1.FinalizeAfterImport();
local1.set_use_count(27); local1.set_use_count(27);
AutofillProfile local2 = AutofillProfile(kGuidB, kSettingsOrigin); AutofillProfile local2 = AutofillProfile(kGuidB, kSettingsOrigin);
local2.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom")); local2.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom"));
local2.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("2 2nd st")); local2.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("2 2nd st"));
local2.FinalizeAfterImport();
AddAutofillProfilesToTable({local1, local2}); AddAutofillProfilesToTable({local1, local2});
// The synced profiles are identical to the local ones, except that the guids // The synced profiles are identical to the local ones, except that the guids
// and use_count values are different. Remote ones have additional company // and use_count values are different. Remote ones have additional company
// name which makes them not be identical. // name which makes them not be identical.
AutofillProfileSpecifics remote1 = AutofillProfile remote1 = AutofillProfile(kGuidC, kHttpOrigin);
CreateAutofillProfileSpecifics(kGuidC, kHttpsOrigin); remote1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
remote1.add_name_first("John"); remote1.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("1 1st st"));
remote1.set_address_home_street_address("1 1st st"); remote1.SetRawInfo(COMPANY_NAME, ASCIIToUTF16("Frobbers, Inc."));
remote1.set_company_name("Frobbers, Inc."); // Note, this populates the full name for structured profiles.
remote1.FinalizeAfterImport();
remote1.set_use_count(13); remote1.set_use_count(13);
AutofillProfileSpecifics remote2 =
CreateAutofillProfileSpecifics(kGuidD, kHttpsOrigin); AutofillProfile remote2 = AutofillProfile(kGuidD, kHttpOrigin);
remote2.add_name_first("Tom"); remote2.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom"));
remote2.set_address_home_street_address("2 2nd st"); remote2.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("2 2nd st"));
remote2.set_company_name("Fizzbang, LLC."); remote2.SetRawInfo(COMPANY_NAME, ASCIIToUTF16("Fizzbang, LLC."));
remote2.FinalizeAfterImport();
remote2.set_use_count(4); remote2.set_use_count(4);
AutofillProfileSpecifics remote1_specifics =
CreateAutofillProfileSpecifics(remote1);
AutofillProfileSpecifics remote2_specifics =
CreateAutofillProfileSpecifics(remote2);
// The first profile should have its origin updated. // The first profile should have its origin updated.
// The second profile should remain as-is, because an unverified profile // The second profile should remain as-is, because an unverified profile
// should never overwrite a verified one. // should never overwrite a verified one.
AutofillProfileSpecifics merged1(remote1); AutofillProfileSpecifics merged1(remote1_specifics);
merged1.set_origin(kHttpOrigin); merged1.set_origin(kHttpOrigin);
// When merging, full name gets populated. // For the legacy implementation, the full name field gets popluated by the
merged1.add_name_full("John"); // merging operation and must be added to the expectation.
// For structured names, the full name is already populated by calling
// |FinalizeAfterImport()|.
if (UsingStructuredNames()) {
ASSERT_GT(merged1.name_full_size(), 0);
ASSERT_EQ(merged1.name_full(0), "John");
} else {
merged1.set_name_full(0, "John");
}
// Merging two profile takes their max use count. // Merging two profile takes their max use count.
merged1.set_use_count(27); merged1.set_use_count(27);
...@@ -731,17 +804,17 @@ TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData_SimilarProfiles) { ...@@ -731,17 +804,17 @@ TEST_F(AutofillProfileSyncBridgeTest, MergeSyncData_SimilarProfiles) {
EXPECT_CALL(mock_processor(), Delete(_, _)).Times(0); EXPECT_CALL(mock_processor(), Delete(_, _)).Times(0);
EXPECT_CALL(*backend(), CommitChanges()); EXPECT_CALL(*backend(), CommitChanges());
StartSyncing({remote1, remote2}); StartSyncing({remote1_specifics, remote2_specifics});
EXPECT_THAT(GetAllLocalData(), EXPECT_THAT(GetAllLocalData(),
UnorderedElementsAre( UnorderedElementsAre(
WithUsageStats(CreateAutofillProfile(merged1)), local2, WithUsageStats(CreateAutofillProfile(merged1)), local2,
WithUsageStats(CreateAutofillProfile(remote2)))); WithUsageStats(CreateAutofillProfile(remote2_specifics))));
} }
// Tests that MergeSimilarProfiles keeps the most recent use date of the two // Tests that MergeSimilarProfiles keeps the most recent use date of the two
// profiles being merged. // profiles being merged.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
MergeSyncData_SimilarProfiles_OlderUseDate) { MergeSyncData_SimilarProfiles_OlderUseDate) {
// Different guids, same origin, difference in the phone number. // Different guids, same origin, difference in the phone number.
AutofillProfile local(kGuidA, kHttpOrigin); AutofillProfile local(kGuidA, kHttpOrigin);
...@@ -766,7 +839,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -766,7 +839,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
// Tests that MergeSimilarProfiles keeps the most recent use date of the two // Tests that MergeSimilarProfiles keeps the most recent use date of the two
// profiles being merged. // profiles being merged.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
MergeSyncData_SimilarProfiles_NewerUseDate) { MergeSyncData_SimilarProfiles_NewerUseDate) {
// Different guids, same origin, difference in the phone number. // Different guids, same origin, difference in the phone number.
AutofillProfile local(kGuidA, kHttpOrigin); AutofillProfile local(kGuidA, kHttpOrigin);
...@@ -790,7 +863,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -790,7 +863,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
// Tests that MergeSimilarProfiles saves the max of the use counts of the two // Tests that MergeSimilarProfiles saves the max of the use counts of the two
// profiles in |remote|. // profiles in |remote|.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
MergeSyncData_SimilarProfiles_NonZeroUseCounts) { MergeSyncData_SimilarProfiles_NonZeroUseCounts) {
// Different guids, same origin, difference in the phone number. // Different guids, same origin, difference in the phone number.
AutofillProfile local(kGuidA, kHttpOrigin); AutofillProfile local(kGuidA, kHttpOrigin);
...@@ -814,21 +887,23 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -814,21 +887,23 @@ TEST_F(AutofillProfileSyncBridgeTest,
// Tests that when merging similar profiles for initial sync, we add the // Tests that when merging similar profiles for initial sync, we add the
// additional information of |local| into |remote|. // additional information of |local| into |remote|.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
MergeSyncData_SimilarProfiles_LocalOriginPreserved) { MergeSyncData_SimilarProfiles_LocalOriginPreserved) {
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
local.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("650234567")); local.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("650234567"));
AddAutofillProfilesToTable({local}); AddAutofillProfilesToTable({local});
AutofillProfile remote_profile = AutofillProfile(kGuidB, kHttpOrigin);
remote_profile.FinalizeAfterImport();
AutofillProfileSpecifics remote = AutofillProfileSpecifics remote =
CreateAutofillProfileSpecifics(kGuidB, kHttpOrigin); CreateAutofillProfileSpecifics(remote_profile);
remote.set_address_home_language_code("en"); remote.set_address_home_language_code("en");
// Expect that the resulting merged profile is written back to sync and that // Expect that the resulting merged profile is written back to sync and that
// it has the phone number and origin from |local|. // it has the phone number and origin from |local|.
AutofillProfileSpecifics merged(remote); AutofillProfileSpecifics merged(remote);
merged.set_origin(kHttpsOrigin); merged.set_origin(kHttpsOrigin);
merged.add_phone_home_whole_number("650234567"); merged.set_phone_home_whole_number(0, "650234567");
// TODO(jkrcal): Is this expected that language code gets deleted? Not // TODO(jkrcal): Is this expected that language code gets deleted? Not
// explicitly covered by previous tests but happens. // explicitly covered by previous tests but happens.
merged.set_address_home_language_code(""); merged.set_address_home_language_code("");
...@@ -840,7 +915,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -840,7 +915,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
// Sync data without origin should not overwrite existing origin in local // Sync data without origin should not overwrite existing origin in local
// autofill profile. // autofill profile.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
MergeSyncData_SimilarProfiles_LocalExistingOriginPreserved) { MergeSyncData_SimilarProfiles_LocalExistingOriginPreserved) {
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
AddAutofillProfilesToTable({local}); AddAutofillProfilesToTable({local});
...@@ -866,16 +941,19 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -866,16 +941,19 @@ TEST_F(AutofillProfileSyncBridgeTest,
// Ensure that no Sync events are generated to fill in missing origins from Sync // Ensure that no Sync events are generated to fill in missing origins from Sync
// with explicitly present empty ones. This ensures that the migration to add // with explicitly present empty ones. This ensures that the migration to add
// origins to profiles does not generate lots of needless Sync updates. // origins to profiles does not generate lots of needless Sync updates.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
MergeSyncData_SimilarProfiles_LocalMissingOriginPreserved) { MergeSyncData_SimilarProfiles_LocalMissingOriginPreserved) {
AutofillProfile local = AutofillProfile(kGuidA, std::string()); AutofillProfile local = AutofillProfile(kGuidA, std::string());
local.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John")); local.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
AddAutofillProfilesToTable({local}); AddAutofillProfilesToTable({local});
// Create a Sync profile identical to |local|, except with no origin set. // Create a Sync profile identical to |local|, except with no origin set.
AutofillProfileSpecifics remote = CreateAutofillProfileSpecifics(kGuidA, ""); AutofillProfile remote_profile = AutofillProfile(kGuidA, "");
remote_profile.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
remote_profile.FinalizeAfterImport();
AutofillProfileSpecifics remote =
CreateAutofillProfileSpecifics(remote_profile);
remote.clear_origin(); remote.clear_origin();
remote.add_name_first("John");
ASSERT_FALSE(remote.has_origin()); ASSERT_FALSE(remote.has_origin());
EXPECT_CALL(mock_processor(), Put(_, _, _)).Times(0); EXPECT_CALL(mock_processor(), Put(_, _, _)).Times(0);
...@@ -884,15 +962,17 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -884,15 +962,17 @@ TEST_F(AutofillProfileSyncBridgeTest,
EXPECT_THAT(GetAllLocalData(), ElementsAre(local)); EXPECT_THAT(GetAllLocalData(), ElementsAre(local));
} }
TEST_F(AutofillProfileSyncBridgeTest, ApplySyncChanges) { TEST_P(AutofillProfileSyncBridgeTest, ApplySyncChanges) {
AutofillProfile local = AutofillProfile(kGuidA, kHttpsOrigin); AutofillProfile local = AutofillProfile(kGuidA, kHttpsOrigin);
AddAutofillProfilesToTable({local}); AddAutofillProfilesToTable({local});
StartSyncing({}); StartSyncing({});
AutofillProfile remote_profile = AutofillProfile(kGuidB, kHttpOrigin);
remote_profile.SetRawInfo(NAME_FIRST, base::ASCIIToUTF16("Jane"));
remote_profile.FinalizeAfterImport();
AutofillProfileSpecifics remote = AutofillProfileSpecifics remote =
CreateAutofillProfileSpecifics(kGuidB, kHttpOrigin); CreateAutofillProfileSpecifics(remote_profile);
remote.add_name_first("Jane");
EXPECT_CALL(mock_processor(), Put(_, _, _)).Times(0); EXPECT_CALL(mock_processor(), Put(_, _, _)).Times(0);
EXPECT_CALL(mock_processor(), Delete(_, _)).Times(0); EXPECT_CALL(mock_processor(), Delete(_, _)).Times(0);
...@@ -908,7 +988,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ApplySyncChanges) { ...@@ -908,7 +988,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ApplySyncChanges) {
} }
// Ensure that entries with invalid specifics are ignored. // Ensure that entries with invalid specifics are ignored.
TEST_F(AutofillProfileSyncBridgeTest, ApplySyncChanges_OmitsInvalidSpecifics) { TEST_P(AutofillProfileSyncBridgeTest, ApplySyncChanges_OmitsInvalidSpecifics) {
StartSyncing({}); StartSyncing({});
AutofillProfileSpecifics remote_valid = AutofillProfileSpecifics remote_valid =
...@@ -932,7 +1012,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ApplySyncChanges_OmitsInvalidSpecifics) { ...@@ -932,7 +1012,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ApplySyncChanges_OmitsInvalidSpecifics) {
// Verifies that setting the street address field also sets the (deprecated) // Verifies that setting the street address field also sets the (deprecated)
// address line 1 and line 2 fields. // address line 1 and line 2 fields.
TEST_F(AutofillProfileSyncBridgeTest, StreetAddress_SplitAutomatically) { TEST_P(AutofillProfileSyncBridgeTest, StreetAddress_SplitAutomatically) {
AutofillProfile local; AutofillProfile local;
local.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("123 Example St.\n" local.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("123 Example St.\n"
"Apt. 42")); "Apt. 42"));
...@@ -951,7 +1031,7 @@ TEST_F(AutofillProfileSyncBridgeTest, StreetAddress_SplitAutomatically) { ...@@ -951,7 +1031,7 @@ TEST_F(AutofillProfileSyncBridgeTest, StreetAddress_SplitAutomatically) {
// Verifies that setting the (deprecated) address line 1 and line 2 fields also // Verifies that setting the (deprecated) address line 1 and line 2 fields also
// sets the street address. // sets the street address.
TEST_F(AutofillProfileSyncBridgeTest, StreetAddress_JointAutomatically) { TEST_P(AutofillProfileSyncBridgeTest, StreetAddress_JointAutomatically) {
AutofillProfile local; AutofillProfile local;
local.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("123 Example St.")); local.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("123 Example St."));
local.SetRawInfo(ADDRESS_HOME_LINE2, ASCIIToUTF16("Apt. 42")); local.SetRawInfo(ADDRESS_HOME_LINE2, ASCIIToUTF16("Apt. 42"));
...@@ -969,7 +1049,7 @@ TEST_F(AutofillProfileSyncBridgeTest, StreetAddress_JointAutomatically) { ...@@ -969,7 +1049,7 @@ TEST_F(AutofillProfileSyncBridgeTest, StreetAddress_JointAutomatically) {
// Ensure that the street address field takes precedence over the (deprecated) // Ensure that the street address field takes precedence over the (deprecated)
// address line 1 and line 2 fields, even though these are expected to always be // address line 1 and line 2 fields, even though these are expected to always be
// in sync in practice. // in sync in practice.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
RemoteWithSameGuid_StreetAddress_TakesPrecedenceOverAddressLines) { RemoteWithSameGuid_StreetAddress_TakesPrecedenceOverAddressLines) {
// Create remote entry with conflicting address data in the street address // Create remote entry with conflicting address data in the street address
// field vs. the address line 1 and address line 2 fields. // field vs. the address line 1 and address line 2 fields.
...@@ -999,7 +1079,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -999,7 +1079,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
// the line1 and line2 fields. This ensures that the migration to add the // the line1 and line2 fields. This ensures that the migration to add the
// street address field to profiles does not generate lots of needless Sync // street address field to profiles does not generate lots of needless Sync
// updates. // updates.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
RemoteWithSameGuid_StreetAddress_NoUpdateToEmptyStreetAddressSyncedUp) { RemoteWithSameGuid_StreetAddress_NoUpdateToEmptyStreetAddressSyncedUp) {
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
local.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("123 Example St.\n" local.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, ASCIIToUTF16("123 Example St.\n"
...@@ -1021,7 +1101,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -1021,7 +1101,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
} }
// Missing language code field should not generate sync events. // Missing language code field should not generate sync events.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
RemoteWithSameGuid_LanguageCode_MissingCodesNoSync) { RemoteWithSameGuid_LanguageCode_MissingCodesNoSync) {
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
ASSERT_TRUE(local.language_code().empty()); ASSERT_TRUE(local.language_code().empty());
...@@ -1040,7 +1120,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -1040,7 +1120,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
} }
// Empty language code should be overwritten by sync. // Empty language code should be overwritten by sync.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
RemoteWithSameGuid_LanguageCode_ExistingRemoteWinsOverMissingLocal) { RemoteWithSameGuid_LanguageCode_ExistingRemoteWinsOverMissingLocal) {
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
ASSERT_TRUE(local.language_code().empty()); ASSERT_TRUE(local.language_code().empty());
...@@ -1059,7 +1139,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -1059,7 +1139,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
} }
// Local language code should be overwritten by remote one. // Local language code should be overwritten by remote one.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
RemoteWithSameGuid_LanguageCode_ExistingRemoteWinsOverExistingLocal) { RemoteWithSameGuid_LanguageCode_ExistingRemoteWinsOverExistingLocal) {
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
local.set_language_code("de"); local.set_language_code("de");
...@@ -1079,7 +1159,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -1079,7 +1159,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
// Sync data without language code should not overwrite existing language code // Sync data without language code should not overwrite existing language code
// in local autofill profile. // in local autofill profile.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
RemoteWithSameGuid_LanguageCode_ExistingLocalWinsOverMissingRemote) { RemoteWithSameGuid_LanguageCode_ExistingLocalWinsOverMissingRemote) {
// Local autofill profile has "en" language code. // Local autofill profile has "en" language code.
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
...@@ -1087,14 +1167,17 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -1087,14 +1167,17 @@ TEST_F(AutofillProfileSyncBridgeTest,
AddAutofillProfilesToTable({local}); AddAutofillProfilesToTable({local});
// Remote data does not have a language code value. // Remote data does not have a language code value.
AutofillProfile remote_profile = AutofillProfile(kGuidA, kHttpsOrigin);
remote_profile.SetRawInfo(NAME_FIRST, base::ASCIIToUTF16("John"));
remote_profile.FinalizeAfterImport();
AutofillProfileSpecifics remote = AutofillProfileSpecifics remote =
CreateAutofillProfileSpecifics(kGuidA, kHttpsOrigin); CreateAutofillProfileSpecifics(remote_profile);
remote.add_name_first("John"); ASSERT_TRUE(remote.address_home_language_code().empty());
ASSERT_FALSE(remote.has_address_home_language_code());
// Expect local autofill profile to still have "en" language code after // Expect local autofill profile to still have "en" language code after
AutofillProfile merged(local); AutofillProfile merged(local);
merged.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John")); merged.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
merged.FinalizeAfterImport();
// No update to sync, remote language code overwrites the local one. // No update to sync, remote language code overwrites the local one.
EXPECT_CALL(mock_processor(), Put(_, _, _)).Times(0); EXPECT_CALL(mock_processor(), Put(_, _, _)).Times(0);
...@@ -1104,7 +1187,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -1104,7 +1187,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
} }
// Missing validity state bitifield should not generate sync events. // Missing validity state bitifield should not generate sync events.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
RemoteWithSameGuid_ValidityState_DefaultValueNoSync) { RemoteWithSameGuid_ValidityState_DefaultValueNoSync) {
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
ASSERT_EQ(0, local.GetClientValidityBitfieldValue()); ASSERT_EQ(0, local.GetClientValidityBitfieldValue());
...@@ -1125,7 +1208,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -1125,7 +1208,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
} }
// Default validity state bitfield should be overwritten by sync. // Default validity state bitfield should be overwritten by sync.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
RemoteWithSameGuid_ValidityState_ExistingRemoteWinsOverMissingLocal) { RemoteWithSameGuid_ValidityState_ExistingRemoteWinsOverMissingLocal) {
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
ASSERT_EQ(0, local.GetClientValidityBitfieldValue()); ASSERT_EQ(0, local.GetClientValidityBitfieldValue());
...@@ -1145,7 +1228,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -1145,7 +1228,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
} }
// Local validity state bitfield should be overwritten by sync. // Local validity state bitfield should be overwritten by sync.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
RemoteWithSameGuid_ValidityState_ExistingRemoteWinsOverExistingLocal) { RemoteWithSameGuid_ValidityState_ExistingRemoteWinsOverExistingLocal) {
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
local.SetClientValidityFromBitfieldValue(kValidityStateBitfield + 1); local.SetClientValidityFromBitfieldValue(kValidityStateBitfield + 1);
...@@ -1166,7 +1249,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -1166,7 +1249,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
// Sync data without a default validity state bitfield should not overwrite // Sync data without a default validity state bitfield should not overwrite
// an existing validity state bitfield in local autofill profile. // an existing validity state bitfield in local autofill profile.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
RemoteWithSameGuid_ValidityState_ExistingLocalWinsOverMissingRemote) { RemoteWithSameGuid_ValidityState_ExistingLocalWinsOverMissingRemote) {
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
local.SetClientValidityFromBitfieldValue(kValidityStateBitfield); local.SetClientValidityFromBitfieldValue(kValidityStateBitfield);
...@@ -1190,7 +1273,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -1190,7 +1273,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
} }
// Missing full name field should not generate sync events. // Missing full name field should not generate sync events.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
RemoteWithSameGuid_FullName_MissingValueNoSync) { RemoteWithSameGuid_FullName_MissingValueNoSync) {
// Local autofill profile has an empty full name. // Local autofill profile has an empty full name.
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
...@@ -1209,27 +1292,64 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -1209,27 +1292,64 @@ TEST_F(AutofillProfileSyncBridgeTest,
EXPECT_THAT(GetAllLocalData(), ElementsAre(local)); EXPECT_THAT(GetAllLocalData(), ElementsAre(local));
} }
TEST_F(AutofillProfileSyncBridgeTest, // This test verifies that for the legacy implementation of names, the full name
// is maintained from the local profile.
// However, this is not a valid use case for structured names as name structures
// must be either merged or fully maintained. For structured names, this test
// verifies that the names are merged.
TEST_P(AutofillProfileSyncBridgeTest,
RemoteWithSameGuid_FullName_ExistingLocalWinsOverMissingRemote) { RemoteWithSameGuid_FullName_ExistingLocalWinsOverMissingRemote) {
// Local autofill profile has a full name. // Local autofill profile has a full name.
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
local.SetRawInfo(NAME_FULL, ASCIIToUTF16("John Jacob Smith, Jr")); local.SetRawInfoWithVerificationStatus(
NAME_FULL, ASCIIToUTF16("John Jacob Smith"),
structured_address::VerificationStatus::kObserved);
local.FinalizeAfterImport();
AddAutofillProfilesToTable({local}); AddAutofillProfilesToTable({local});
if (UsingStructuredNames()) {
// After finalization, the first, middle and last name should have the
// status |kParsed|.
ASSERT_EQ(local.GetVerificationStatus(NAME_FIRST),
structured_address::VerificationStatus::kParsed);
ASSERT_EQ(local.GetVerificationStatus(NAME_MIDDLE),
structured_address::VerificationStatus::kParsed);
ASSERT_EQ(local.GetVerificationStatus(NAME_LAST),
structured_address::VerificationStatus::kParsed);
}
// Remote data does not have a full name value. // Remote data does not have a full name value.
AutofillProfile remote_profile = AutofillProfile(kGuidA, kHttpsOrigin);
remote_profile.SetRawInfoWithVerificationStatus(
NAME_FIRST, base::ASCIIToUTF16("John"),
structured_address::VerificationStatus::kObserved);
remote_profile.SetRawInfoWithVerificationStatus(
NAME_MIDDLE, base::ASCIIToUTF16("Jacob"),
structured_address::VerificationStatus::kObserved);
remote_profile.SetRawInfoWithVerificationStatus(
NAME_LAST, base::ASCIIToUTF16("Smith"),
structured_address::VerificationStatus::kObserved);
remote_profile.FinalizeAfterImport();
AutofillProfileSpecifics remote = AutofillProfileSpecifics remote =
CreateAutofillProfileSpecifics(kGuidA, kHttpsOrigin); CreateAutofillProfileSpecifics(remote_profile);
remote.add_name_first(std::string("John"));
remote.add_name_middle(std::string("Jacob"));
remote.add_name_last(std::string("Smith"));
// Expect local autofill profile to still have the same full name after. // Expect local autofill profile to still have the same full name after.
AutofillProfile merged(local); AutofillProfile merged(local);
merged.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
merged.SetRawInfo(NAME_MIDDLE, ASCIIToUTF16("Jacob"));
merged.SetRawInfo(NAME_LAST, ASCIIToUTF16("Smith"));
// No update to sync, no change in local data. // Note, for structured names, the verification status of those tokens is
// |kParsed| for local and becomes |kObserved| when merged with the remote
// profile.
merged.SetRawInfoWithVerificationStatus(
NAME_FIRST, base::ASCIIToUTF16("John"),
structured_address::VerificationStatus::kObserved);
merged.SetRawInfoWithVerificationStatus(
NAME_MIDDLE, base::ASCIIToUTF16("Jacob"),
structured_address::VerificationStatus::kObserved);
merged.SetRawInfoWithVerificationStatus(
NAME_LAST, base::ASCIIToUTF16("Smith"),
structured_address::VerificationStatus::kObserved);
// No update to sync, merged changes in local data.
EXPECT_CALL(mock_processor(), Put(_, _, _)).Times(0); EXPECT_CALL(mock_processor(), Put(_, _, _)).Times(0);
EXPECT_CALL(*backend(), CommitChanges()); EXPECT_CALL(*backend(), CommitChanges());
StartSyncing({remote}); StartSyncing({remote});
...@@ -1237,7 +1357,7 @@ TEST_F(AutofillProfileSyncBridgeTest, ...@@ -1237,7 +1357,7 @@ TEST_F(AutofillProfileSyncBridgeTest,
} }
// Missing use_count/use_date fields should not generate sync events. // Missing use_count/use_date fields should not generate sync events.
TEST_F(AutofillProfileSyncBridgeTest, TEST_P(AutofillProfileSyncBridgeTest,
RemoteWithSameGuid_UsageStats_MissingValueNoSync) { RemoteWithSameGuid_UsageStats_MissingValueNoSync) {
// Local autofill profile has 0 for use_count/use_date. // Local autofill profile has 0 for use_count/use_date.
AutofillProfile local(kGuidA, kHttpsOrigin); AutofillProfile local(kGuidA, kHttpsOrigin);
...@@ -1270,7 +1390,7 @@ struct UpdatesUsageStatsTestCase { ...@@ -1270,7 +1390,7 @@ struct UpdatesUsageStatsTestCase {
}; };
class AutofillProfileSyncBridgeUpdatesUsageStatsTest class AutofillProfileSyncBridgeUpdatesUsageStatsTest
: public AutofillProfileSyncBridgeTest, : public AutofillProfileSyncBridgeTestBase,
public testing::WithParamInterface<UpdatesUsageStatsTestCase> { public testing::WithParamInterface<UpdatesUsageStatsTestCase> {
public: public:
AutofillProfileSyncBridgeUpdatesUsageStatsTest() {} AutofillProfileSyncBridgeUpdatesUsageStatsTest() {}
...@@ -1314,6 +1434,9 @@ TEST_P(AutofillProfileSyncBridgeUpdatesUsageStatsTest, UpdatesUsageStats) { ...@@ -1314,6 +1434,9 @@ TEST_P(AutofillProfileSyncBridgeUpdatesUsageStatsTest, UpdatesUsageStats) {
EXPECT_THAT(GetAllLocalData(), ElementsAre(WithUsageStats(merged))); EXPECT_THAT(GetAllLocalData(), ElementsAre(WithUsageStats(merged)));
} }
// Test the sync bridge with and without structured names.
INSTANTIATE_TEST_SUITE_P(, AutofillProfileSyncBridgeTest, testing::Bool());
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
AutofillProfileSyncBridgeTest, AutofillProfileSyncBridgeTest,
AutofillProfileSyncBridgeUpdatesUsageStatsTest, AutofillProfileSyncBridgeUpdatesUsageStatsTest,
......
components/autofill/core/browser/webdata/autofill_profile_sync_difference_tracker.cc
View file @ 0d91c6b9
...@@ -48,12 +48,24 @@ AutofillProfileSyncDifferenceTracker::IncorporateRemoteProfile( ...@@ -48,12 +48,24 @@ AutofillProfileSyncDifferenceTracker::IncorporateRemoteProfile(
return base::nullopt; return base::nullopt;
} }
updated->OverwriteDataFrom(*remote); updated->OverwriteDataFrom(*remote);
// TODO(jkrcal): if |updated| deviates from |remote|, we should sync it back // TODO(crbug.com/1117022l): if |updated| deviates from |remote|, we should
// up. The only way |updated| can differ is having some extra fields // sync it back up. The only way |updated| can differ is having some extra
// compared to |remote|. Thus, this cannot lead to an infinite loop of // fields compared to |remote|. Thus, this cannot lead to an infinite loop
// commits from two clients as each commit decreases the set of empty // of commits from two clients as each commit decreases the set of empty
// fields. This invariant depends on the implementation of // fields. This invariant depends on the implementation of
// OverwriteDataFrom() and thus should be enforced by a DCHECK. // OverwriteDataFrom() and thus should be enforced by a DCHECK.
//
// With structured names the situation changes a bit,
// but maintains its character.
// If the name stored in |remote| is mergeable with the local |name|, the
// merge operation is performed. Otherwise the name structure of |local| is
// maintained iff |remote| contains an empty name.
// A merge operations manipulates the name towards a better total
// verification status of the stored tokens. Consequently, it is not
// possible to get into a merging loop of two competing clients.
// As in the legacy implementation, |OverwriteDataForm()| can change the
// profile in a deterministic way and a direct sync-back would be
// reasonable.
if (!updated->EqualsForSyncPurposes(*local_with_same_storage_key)) { if (!updated->EqualsForSyncPurposes(*local_with_same_storage_key)) {
// We need to write back locally new changes in this entry. // We need to write back locally new changes in this entry.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment