OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
435 } | 435 } |
436 | 436 |
437 TEST_F(TemplateURLServiceSyncTest, GetAllSyncDataWithSearchOverrideExtension) { | 437 TEST_F(TemplateURLServiceSyncTest, GetAllSyncDataWithSearchOverrideExtension) { |
438 model()->Add(CreateTestTemplateURL(ASCIIToUTF16("key1"), "http://key1.com")); | 438 model()->Add(CreateTestTemplateURL(ASCIIToUTF16("key1"), "http://key1.com")); |
439 model()->Add(CreateTestTemplateURL(ASCIIToUTF16("key2"), "http://key2.com")); | 439 model()->Add(CreateTestTemplateURL(ASCIIToUTF16("key2"), "http://key2.com")); |
440 | 440 |
441 // Change default search provider to an extension one. | 441 // Change default search provider to an extension one. |
442 std::unique_ptr<TemplateURLData> extension = | 442 std::unique_ptr<TemplateURLData> extension = |
443 GenerateDummyTemplateURLData("extension"); | 443 GenerateDummyTemplateURLData("extension"); |
444 auto ext_dse = base::MakeUnique<TemplateURL>( | 444 auto ext_dse = base::MakeUnique<TemplateURL>( |
445 *extension, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION); | 445 *extension, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, "ext", Time(), |
446 test_util_a_->AddExtensionControlledTURL(std::move(ext_dse), "ext", true); | 446 true); |
| 447 test_util_a_->AddExtensionControlledTURL(std::move(ext_dse)); |
447 | 448 |
448 const TemplateURL* ext_turl = model()->GetDefaultSearchProvider(); | 449 const TemplateURL* ext_turl = model()->GetDefaultSearchProvider(); |
449 EXPECT_TRUE(model()->IsExtensionControlledDefaultSearch()); | 450 EXPECT_TRUE(model()->IsExtensionControlledDefaultSearch()); |
450 | 451 |
451 // Extension default search must not be synced across browsers. | 452 // Extension default search must not be synced across browsers. |
452 syncer::SyncDataList all_sync_data = | 453 syncer::SyncDataList all_sync_data = |
453 model()->GetAllSyncData(syncer::SEARCH_ENGINES); | 454 model()->GetAllSyncData(syncer::SEARCH_ENGINES); |
454 EXPECT_EQ(2U, all_sync_data.size()); | 455 EXPECT_EQ(2U, all_sync_data.size()); |
455 | 456 |
456 for (auto sync_data : all_sync_data) { | 457 for (auto sync_data : all_sync_data) { |
(...skipping 1295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1752 | 1753 |
1753 const size_t sync_engines_count = | 1754 const size_t sync_engines_count = |
1754 model()->GetAllSyncData(syncer::SEARCH_ENGINES).size(); | 1755 model()->GetAllSyncData(syncer::SEARCH_ENGINES).size(); |
1755 EXPECT_EQ(3U, sync_engines_count); | 1756 EXPECT_EQ(3U, sync_engines_count); |
1756 ASSERT_TRUE(model()->GetDefaultSearchProvider()); | 1757 ASSERT_TRUE(model()->GetDefaultSearchProvider()); |
1757 | 1758 |
1758 // Change the default search provider to an extension one. | 1759 // Change the default search provider to an extension one. |
1759 std::unique_ptr<TemplateURLData> extension = | 1760 std::unique_ptr<TemplateURLData> extension = |
1760 GenerateDummyTemplateURLData("extensiondefault"); | 1761 GenerateDummyTemplateURLData("extensiondefault"); |
1761 auto ext_dse = base::MakeUnique<TemplateURL>( | 1762 auto ext_dse = base::MakeUnique<TemplateURL>( |
1762 *extension, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION); | 1763 *extension, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, "ext", Time(), |
1763 test_util_a_->AddExtensionControlledTURL(std::move(ext_dse), "ext", true); | 1764 true); |
| 1765 test_util_a_->AddExtensionControlledTURL(std::move(ext_dse)); |
1764 | 1766 |
1765 const TemplateURL* dsp_turl = model()->GetDefaultSearchProvider(); | 1767 const TemplateURL* dsp_turl = model()->GetDefaultSearchProvider(); |
1766 EXPECT_TRUE(model()->IsExtensionControlledDefaultSearch()); | 1768 EXPECT_TRUE(model()->IsExtensionControlledDefaultSearch()); |
1767 | 1769 |
1768 // Extension-related changes to the DSE should not be synced as search engine | 1770 // Extension-related changes to the DSE should not be synced as search engine |
1769 // changes. | 1771 // changes. |
1770 EXPECT_EQ(pending_changes, processor()->change_list_size()); | 1772 EXPECT_EQ(pending_changes, processor()->change_list_size()); |
1771 EXPECT_EQ(sync_engines_count, | 1773 EXPECT_EQ(sync_engines_count, |
1772 model()->GetAllSyncData(syncer::SEARCH_ENGINES).size()); | 1774 model()->GetAllSyncData(syncer::SEARCH_ENGINES).size()); |
1773 | 1775 |
(...skipping 30 matching lines...) Expand all Loading... |
1804 TEST_F(TemplateURLServiceSyncTest, ExtensionAndNormalEngineConflict) { | 1806 TEST_F(TemplateURLServiceSyncTest, ExtensionAndNormalEngineConflict) { |
1805 // Start with empty model. | 1807 // Start with empty model. |
1806 model()->MergeDataAndStartSyncing(syncer::SEARCH_ENGINES, | 1808 model()->MergeDataAndStartSyncing(syncer::SEARCH_ENGINES, |
1807 syncer::SyncDataList(), PassProcessor(), | 1809 syncer::SyncDataList(), PassProcessor(), |
1808 CreateAndPassSyncErrorFactory()); | 1810 CreateAndPassSyncErrorFactory()); |
1809 const base::string16 kCommonKeyword = ASCIIToUTF16("common_keyword"); | 1811 const base::string16 kCommonKeyword = ASCIIToUTF16("common_keyword"); |
1810 // Change the default search provider to an extension one. | 1812 // Change the default search provider to an extension one. |
1811 std::unique_ptr<TemplateURLData> extension = | 1813 std::unique_ptr<TemplateURLData> extension = |
1812 GenerateDummyTemplateURLData("common_keyword"); | 1814 GenerateDummyTemplateURLData("common_keyword"); |
1813 auto ext_dse = base::MakeUnique<TemplateURL>( | 1815 auto ext_dse = base::MakeUnique<TemplateURL>( |
1814 *extension, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION); | 1816 *extension, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, "ext", Time(), |
| 1817 true); |
1815 const TemplateURL* extension_turl = | 1818 const TemplateURL* extension_turl = |
1816 test_util_a_->AddExtensionControlledTURL(std::move(ext_dse), "ext", true); | 1819 test_util_a_->AddExtensionControlledTURL(std::move(ext_dse)); |
1817 EXPECT_TRUE(model()->IsExtensionControlledDefaultSearch()); | 1820 EXPECT_TRUE(model()->IsExtensionControlledDefaultSearch()); |
1818 EXPECT_EQ(extension_turl, model()->GetTemplateURLForKeyword(kCommonKeyword)); | 1821 EXPECT_EQ(extension_turl, model()->GetTemplateURLForKeyword(kCommonKeyword)); |
1819 | 1822 |
1820 // Add through sync normal engine with the same keyword as extension. | 1823 // Add through sync normal engine with the same keyword as extension. |
1821 syncer::SyncChangeList changes; | 1824 syncer::SyncChangeList changes; |
1822 changes.push_back(CreateTestSyncChange( | 1825 changes.push_back(CreateTestSyncChange( |
1823 syncer::SyncChange::ACTION_ADD, | 1826 syncer::SyncChange::ACTION_ADD, |
1824 CreateTestTemplateURL(kCommonKeyword, "http://normal.com", "normal_guid", | 1827 CreateTestTemplateURL(kCommonKeyword, "http://normal.com", "normal_guid", |
1825 10))); | 1828 10))); |
1826 model()->ProcessSyncChanges(FROM_HERE, changes); | 1829 model()->ProcessSyncChanges(FROM_HERE, changes); |
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2481 | 2484 |
2482 TEST_F(TemplateURLServiceSyncTest, NonAsciiKeywordDoesNotCrash) { | 2485 TEST_F(TemplateURLServiceSyncTest, NonAsciiKeywordDoesNotCrash) { |
2483 model()->Add(CreateTestTemplateURL(UTF8ToUTF16("\xf0\xaf\xa6\x8d"), | 2486 model()->Add(CreateTestTemplateURL(UTF8ToUTF16("\xf0\xaf\xa6\x8d"), |
2484 "http://key1.com")); | 2487 "http://key1.com")); |
2485 syncer::SyncDataList initial_data = CreateInitialSyncData(); | 2488 syncer::SyncDataList initial_data = CreateInitialSyncData(); |
2486 | 2489 |
2487 model()->MergeDataAndStartSyncing( | 2490 model()->MergeDataAndStartSyncing( |
2488 syncer::SEARCH_ENGINES, initial_data, PassProcessor(), | 2491 syncer::SEARCH_ENGINES, initial_data, PassProcessor(), |
2489 CreateAndPassSyncErrorFactory()); | 2492 CreateAndPassSyncErrorFactory()); |
2490 } | 2493 } |
OLD | NEW |