Index: chrome/browser/search_engines/template_url_service_sync_unittest.cc |
diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc |
index 8a1a1f699d17175660dbc22de3a805fb9f980fcb..395171cb6c1f2e81050ca6322c118f9536e3e4ef 100644 |
--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc |
+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc |
@@ -83,6 +83,7 @@ syncer::SyncData CreateCustomSyncData(const TemplateURL& turl, |
se_specifics->set_autogenerate_keyword(autogenerate_keyword); |
se_specifics->set_instant_url(turl.instant_url()); |
se_specifics->set_last_modified(turl.last_modified().ToInternalValue()); |
+ se_specifics->set_last_visited(turl.last_visited().ToInternalValue()); |
se_specifics->set_sync_guid(sync_guid); |
return syncer::SyncData::CreateLocalData(turl.sync_guid(), // Must be valid! |
se_specifics->keyword(), specifics); |
@@ -295,6 +296,7 @@ std::unique_ptr<TemplateURL> TemplateURLServiceSyncTest::CreateTestTemplateURL( |
data.safe_for_autoreplace = safe_for_autoreplace; |
data.date_created = Time::FromTimeT(100); |
data.last_modified = Time::FromTimeT(last_mod); |
+ data.last_visited = Time::FromTimeT(100); |
Peter Kasting
2016/11/21 03:35:07
It may be possible to remove most of the explicit
ltian
2016/11/28 22:08:01
I think these explicitly setting is used for some
|
data.created_by_policy = created_by_policy; |
data.prepopulate_id = prepopulate_id; |
if (!guid.empty()) |
@@ -313,6 +315,7 @@ void TemplateURLServiceSyncTest::AssertEquals(const TemplateURL& expected, |
ASSERT_EQ(expected.input_encodings(), actual.input_encodings()); |
ASSERT_EQ(expected.date_created(), actual.date_created()); |
ASSERT_EQ(expected.last_modified(), actual.last_modified()); |
+ ASSERT_EQ(expected.last_visited(), actual.last_visited()); |
} |
void TemplateURLServiceSyncTest::AssertEquals( |
@@ -376,6 +379,7 @@ std::unique_ptr<TemplateURL> TemplateURLServiceSyncTest::CopyTemplateURL( |
data.SetURL(url); |
data.date_created = Time::FromTimeT(100); |
data.last_modified = Time::FromTimeT(100); |
+ data.last_visited = Time::FromTimeT(100); |
data.sync_guid = guid; |
return base::MakeUnique<TemplateURL>(data); |
} |
@@ -1269,6 +1273,7 @@ TEST_F(TemplateURLServiceSyncTest, DuplicateEncodingsRemoved) { |
data.input_encodings.push_back("Windows-1252"); |
data.date_created = Time::FromTimeT(100); |
data.last_modified = Time::FromTimeT(100); |
+ data.last_visited = Time::FromTimeT(100); |
data.sync_guid = "keyword"; |
std::unique_ptr<TemplateURL> turl(new TemplateURL(data)); |
initial_data.push_back( |
@@ -1521,6 +1526,7 @@ TEST_F(TemplateURLServiceSyncTest, DefaultGuidDeletedBeforeNewDSPArrives) { |
data.safe_for_autoreplace = false; |
data.date_created = Time::FromTimeT(100); |
data.last_modified = Time::FromTimeT(100); |
+ data.last_visited = Time::FromTimeT(100); |
data.created_by_policy = false; |
data.prepopulate_id = 999999; |
data.sync_guid = "key2"; |
@@ -2178,11 +2184,13 @@ TEST_F(TemplateURLServiceSyncTest, MergeEditedPrepopulatedEngine) { |
data.SetURL("http://wrong.url.com?q={searchTerms}"); |
data.date_created = Time::FromTimeT(50); |
data.last_modified = Time::FromTimeT(50); |
+ data.last_visited = Time::FromTimeT(50); |
data.sync_guid = "default"; |
model()->Add(base::MakeUnique<TemplateURL>(data)); |
data.date_created = Time::FromTimeT(100); |
data.last_modified = Time::FromTimeT(100); |
+ data.last_visited = Time::FromTimeT(100); |
std::unique_ptr<TemplateURL> sync_turl(new TemplateURL(data)); |
syncer::SyncDataList list; |
list.push_back(TemplateURLService::CreateSyncDataFromTemplateURL(*sync_turl)); |
@@ -2208,6 +2216,7 @@ TEST_F(TemplateURLServiceSyncTest, MergeConflictingPrepopulatedEngine) { |
data.safe_for_autoreplace = true; |
data.date_created = Time::FromTimeT(50); |
data.last_modified = Time::FromTimeT(50); |
+ data.last_visited = Time::FromTimeT(50); |
data.prepopulate_id = 1; |
data.sync_guid = "default"; |
model()->Add(base::MakeUnique<TemplateURL>(data)); |
@@ -2219,6 +2228,7 @@ TEST_F(TemplateURLServiceSyncTest, MergeConflictingPrepopulatedEngine) { |
new_data.safe_for_autoreplace = false; |
new_data.date_created = Time::FromTimeT(100); |
new_data.last_modified = Time::FromTimeT(100); |
+ new_data.last_visited = Time::FromTimeT(100); |
new_data.prepopulate_id = 1; |
new_data.sync_guid = "different_guid"; |
@@ -2272,11 +2282,13 @@ TEST_F(TemplateURLServiceSyncTest, MergeNonEditedPrepopulatedEngine) { |
data.SetURL("http://wrong.url.com?q={searchTerms}"); |
data.date_created = Time::FromTimeT(50); |
data.last_modified = Time::FromTimeT(50); |
+ data.last_visited = Time::FromTimeT(50); |
data.sync_guid = "default"; |
model()->Add(base::MakeUnique<TemplateURL>(data)); |
data.date_created = Time::FromTimeT(100); |
data.last_modified = Time::FromTimeT(100); |
+ data.last_visited = Time::FromTimeT(100); |
std::unique_ptr<TemplateURL> sync_turl(new TemplateURL(data)); |
syncer::SyncDataList list; |
list.push_back(TemplateURLService::CreateSyncDataFromTemplateURL(*sync_turl)); |