Index: chrome/browser/search_engines/template_url_service_unittest.cc |
diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc |
index f872c83e5ca2f39c7136823b6df599b80005bd9f..e1b3a028fd4ef3e53cf03716046795aa483abc95 100644 |
--- a/chrome/browser/search_engines/template_url_service_unittest.cc |
+++ b/chrome/browser/search_engines/template_url_service_unittest.cc |
@@ -1405,16 +1405,15 @@ TEST_F(TemplateURLServiceTest, DefaultExtensionEngine) { |
std::unique_ptr<TemplateURL::AssociatedExtensionInfo> extension_info( |
new TemplateURL::AssociatedExtensionInfo("ext")); |
extension_info->wants_to_be_default_engine = true; |
- TemplateURL* ext_dse_ptr = model()->AddExtensionControlledTURL( |
+ TemplateURL* ext_dse_ptr = test_util()->AddExtensionControlledTURL( |
std::move(ext_dse), std::move(extension_info)); |
EXPECT_EQ(ext_dse_ptr, model()->GetDefaultSearchProvider()); |
- model()->RemoveExtensionControlledTURL( |
- "ext", TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION); |
+ test_util()->RemoveExtensionControlledTURL("ext"); |
ExpectSimilar(user_dse, model()->GetDefaultSearchProvider()); |
} |
-TEST_F(TemplateURLServiceTest, ExtensionEnginesNotPersist) { |
+TEST_F(TemplateURLServiceTest, DefaultExtensionEnginePersist) { |
test_util()->VerifyLoad(); |
// Add third-party default search engine. |
TemplateURL* user_dse = AddKeywordWithDate( |
@@ -1423,6 +1422,7 @@ TEST_F(TemplateURLServiceTest, ExtensionEnginesNotPersist) { |
model()->SetUserSelectedDefaultSearchProvider(user_dse); |
EXPECT_EQ(user_dse, model()->GetDefaultSearchProvider()); |
+ // Create non default extension search engine. |
std::unique_ptr<TemplateURL> ext_dse = CreateKeywordWithDate( |
model(), "ext1", "ext1", "http://www.ext1.com/s?q={searchTerms}", |
std::string(), std::string(), std::string(), true, 0, "UTF-8", Time(), |
@@ -1430,10 +1430,11 @@ TEST_F(TemplateURLServiceTest, ExtensionEnginesNotPersist) { |
std::unique_ptr<TemplateURL::AssociatedExtensionInfo> extension_info( |
new TemplateURL::AssociatedExtensionInfo("ext1")); |
extension_info->wants_to_be_default_engine = false; |
- model()->AddExtensionControlledTURL(std::move(ext_dse), |
- std::move(extension_info)); |
- EXPECT_EQ(user_dse, model()->GetDefaultSearchProvider()); |
+ test_util()->AddExtensionControlledTURL(std::move(ext_dse), |
+ std::move(extension_info)); |
+ EXPECT_EQ(user_dse, model()->GetDefaultSearchProvider()); |
+ // Create default extension search engine. |
ext_dse = CreateKeywordWithDate( |
model(), "ext2", "ext2", "http://www.ext2.com/s?q={searchTerms}", |
std::string(), std::string(), std::string(), true, kPrepopulatedId, |
@@ -1441,15 +1442,43 @@ TEST_F(TemplateURLServiceTest, ExtensionEnginesNotPersist) { |
TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION); |
extension_info.reset(new TemplateURL::AssociatedExtensionInfo("ext2")); |
extension_info->wants_to_be_default_engine = true; |
- TemplateURL* ext_dse_ptr = model()->AddExtensionControlledTURL( |
+ |
+ std::unique_ptr<TemplateURL> cloned_ext_dse( |
+ base::MakeUnique<TemplateURL>(ext_dse->data())); |
+ TemplateURL* ext_dse_ptr = test_util()->AddExtensionControlledTURL( |
std::move(ext_dse), std::move(extension_info)); |
EXPECT_EQ(ext_dse_ptr, model()->GetDefaultSearchProvider()); |
- test_util()->ResetModel(true); |
- user_dse = model()->GetTemplateURLForKeyword(ASCIIToUTF16("user")); |
- ExpectSimilar(user_dse, model()->GetDefaultSearchProvider()); |
+ test_util()->ResetModel(false); |
+ // Non default extension engines are not persisted. |
EXPECT_FALSE(model()->GetTemplateURLForKeyword(ASCIIToUTF16("ext1"))); |
- EXPECT_FALSE(model()->GetTemplateURLForKeyword(ASCIIToUTF16("ext2"))); |
+ |
+ // Default search engine from extension must be persisted between browser |
+ // restarts, until extension is unloaded/disabled. |
+ // Check it persists before template url service loaded. |
+ EXPECT_TRUE(model()->GetTemplateURLForKeyword(ASCIIToUTF16("ext2"))); |
+ TemplateURL* current_dse = model()->GetDefaultSearchProvider(); |
+ ExpectSimilar(cloned_ext_dse.get(), current_dse); |
+ |
+ // Emulate extension system loaded and extension registers itself to template |
vasilii
2016/12/20 16:50:26
Wouldn't it be better to split the test into two h
Alexander Yashkin
2016/12/20 18:44:54
Done
|
+ // url service, this is always done before TemplateURLService is loaded. |
+ ext_dse = CreateKeywordWithDate( |
+ model(), "ext2", "ext2", "http://www.ext2.com/s?q={searchTerms}", |
+ std::string(), std::string(), std::string(), true, kPrepopulatedId, |
+ "UTF-8", Time(), Time(), Time(), |
+ TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION); |
+ extension_info.reset(new TemplateURL::AssociatedExtensionInfo("ext2")); |
+ extension_info->wants_to_be_default_engine = true; |
+ |
+ test_util()->AddExtensionControlledTURL(std::move(ext_dse), |
+ std::move(extension_info)); |
+ // Load template url service. |
+ test_util()->VerifyLoad(); |
+ current_dse = model()->GetDefaultSearchProvider(); |
+ ExpectSimilar(cloned_ext_dse.get(), current_dse); |
+ |
+ current_dse = model()->GetDefaultSearchProvider(); |
+ ExpectSimilar(cloned_ext_dse.get(), current_dse); |
} |
TEST_F(TemplateURLServiceTest, ExtensionEngineVsPolicy) { |
@@ -1472,7 +1501,7 @@ TEST_F(TemplateURLServiceTest, ExtensionEngineVsPolicy) { |
auto extension_info = |
base::MakeUnique<TemplateURL::AssociatedExtensionInfo>("ext1"); |
extension_info->wants_to_be_default_engine = true; |
- TemplateURL* ext_dse_ptr = model()->AddExtensionControlledTURL( |
+ TemplateURL* ext_dse_ptr = test_util()->AddExtensionControlledTURL( |
std::move(ext_dse), std::move(extension_info)); |
EXPECT_EQ(ext_dse_ptr, |
model()->GetTemplateURLForKeyword(ASCIIToUTF16("ext1"))); |