| 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 225a51d7c0835008616c5925300c6e9d9b5b184d..8a1a1f699d17175660dbc22de3a805fb9f980fcb 100644
|
| --- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc
|
| +++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
|
| @@ -77,7 +77,6 @@ syncer::SyncData CreateCustomSyncData(const TemplateURL& turl,
|
| se_specifics->set_date_created(turl.date_created().ToInternalValue());
|
| se_specifics->set_input_encodings(
|
| base::JoinString(turl.input_encodings(), ";"));
|
| - se_specifics->set_show_in_default_list(turl.show_in_default_list());
|
| se_specifics->set_suggestions_url(turl.suggestions_url());
|
| se_specifics->set_prepopulate_id(prepopulate_id == -1 ? turl.prepopulate_id()
|
| : prepopulate_id);
|
| @@ -310,7 +309,6 @@ void TemplateURLServiceSyncTest::AssertEquals(const TemplateURL& expected,
|
| ASSERT_EQ(expected.url(), actual.url());
|
| ASSERT_EQ(expected.suggestions_url(), actual.suggestions_url());
|
| ASSERT_EQ(expected.favicon_url(), actual.favicon_url());
|
| - ASSERT_EQ(expected.show_in_default_list(), actual.show_in_default_list());
|
| ASSERT_EQ(expected.safe_for_autoreplace(), actual.safe_for_autoreplace());
|
| ASSERT_EQ(expected.input_encodings(), actual.input_encodings());
|
| ASSERT_EQ(expected.date_created(), actual.date_created());
|
| @@ -1093,9 +1091,10 @@ TEST_F(TemplateURLServiceSyncTest, ProcessChangesWithLocalExtensions) {
|
|
|
| // Create some sync changes that will conflict with the extension keywords.
|
| syncer::SyncChangeList changes;
|
| - changes.push_back(CreateTestSyncChange(syncer::SyncChange::ACTION_ADD,
|
| - CreateTestTemplateURL(ASCIIToUTF16("keyword1"), "http://aaa.com",
|
| - std::string(), 100, true)));
|
| + changes.push_back(CreateTestSyncChange(
|
| + syncer::SyncChange::ACTION_ADD,
|
| + CreateTestTemplateURL(ASCIIToUTF16("keyword1"), "http://aaa.com",
|
| + std::string(), 100, true, false, 0)));
|
| changes.push_back(CreateTestSyncChange(syncer::SyncChange::ACTION_ADD,
|
| CreateTestTemplateURL(ASCIIToUTF16("keyword2"), "http://bbb.com")));
|
| model()->ProcessSyncChanges(FROM_HERE, changes);
|
| @@ -1525,7 +1524,6 @@ TEST_F(TemplateURLServiceSyncTest, DefaultGuidDeletedBeforeNewDSPArrives) {
|
| data.created_by_policy = false;
|
| data.prepopulate_id = 999999;
|
| data.sync_guid = "key2";
|
| - data.show_in_default_list = true;
|
| std::unique_ptr<TemplateURL> turl2(new TemplateURL(data));
|
| initial_data.push_back(TemplateURLService::CreateSyncDataFromTemplateURL(
|
| *turl1));
|
|
|