-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/values.h"
#include "components/search_engines/search_terms_data.h"
#include "components/search_engines/template_url.h"
#include "components/search_engines/template_url_service.h"
std::unique_ptr<TemplateURLData> CreatePrepopulateTemplateURLData(
int prepopulate_id,
- const std::string& keyword,
- TemplateURLID id) {
- std::unique_ptr<TemplateURLData> data(new TemplateURLData);
- data->prepopulate_id = prepopulate_id;
- data->SetKeyword(base::ASCIIToUTF16(keyword));
- data->id = id;
- return data;
+ const std::string& keyword) {
+ return std::make_unique<TemplateURLData>(
+ u"Search engine name", base::ASCIIToUTF16(keyword), "https://search.url",
+ "" /* suggest_url */, "" /* image_url */, "" /* image_translate_url */,
+ "" /* new_tab_url */, "" /* contextual_search_url */, "" /* logo_url */,
+ "" /* doodle_url */, "" /* search_url_post_params */,
+ "" /* suggest_url_post_params */, "" /* image_url_post_params */,
+ "" /* side_search_param */, "" /* side_image_search_param */,
+ "" /* image_translate_source_language_param_key */,
+ "" /* image_translate_target_language_param_key */,
+ std::vector<std::string>() /* search_intent_params */,
+ "" /* favicon_url */, "UTF-8", u"" /* image_search_branding_label */,
+ base::Value::List() /* alternate_urls_list */,
+ false /* preconnect_to_search_url */,
+ false /* prefetch_likely_navigations */, prepopulate_id);
}
// Creates a TemplateURL with default values except for the prepopulate ID,
std::unique_ptr<TemplateURL> CreatePrepopulateTemplateURL(
int prepopulate_id,
const std::string& keyword,
- TemplateURLID id) {
- return std::make_unique<TemplateURL>(
- *CreatePrepopulateTemplateURLData(prepopulate_id, keyword, id));
+ TemplateURLID id,
+ bool is_play_api_turl = false) {
+ std::unique_ptr<TemplateURLData> data =
+ CreatePrepopulateTemplateURLData(prepopulate_id, keyword);
+ data->id = id;
+ data->created_from_play_api = is_play_api_turl;
+ return std::make_unique<TemplateURL>(*data);
}
} // namespace
std::vector<std::unique_ptr<TemplateURLData>> prepopulated_turls;
TemplateURLService::OwnedTemplateURLVector local_turls;
- prepopulated_turls.push_back(
- CreatePrepopulateTemplateURLData(1, "winner4", 1));
- prepopulated_turls.push_back(CreatePrepopulateTemplateURLData(2, "xxx", 2));
- prepopulated_turls.push_back(CreatePrepopulateTemplateURLData(3, "yyy", 3));
+ prepopulated_turls.push_back(CreatePrepopulateTemplateURLData(1, "winner4"));
+ prepopulated_turls.push_back(CreatePrepopulateTemplateURLData(2, "xxx"));
+ prepopulated_turls.push_back(CreatePrepopulateTemplateURLData(3, "yyy"));
// Create a sets of different TURLs grouped by prepopulate ID. Each group
// will test a different heuristic of RemoveDuplicatePrepopulateIDs.
EXPECT_EQ(local_turls.size(),
prepopulated_turls.size() + num_non_prepopulated_urls);
for (const auto& turl : local_turls) {
- EXPECT_TRUE(base::StartsWith(turl->keyword(), base::ASCIIToUTF16("winner"),
+ EXPECT_TRUE(base::StartsWith(turl->keyword(), u"winner",
base::CompareCase::SENSITIVE));
}
}
+
+// Tests correct interaction of Play API search engine during prepopulated list
+// update.
+TEST(TemplateURLServiceUtilTest, MergeEnginesFromPrepopulateData_PlayAPI) {
+ std::vector<std::unique_ptr<TemplateURLData>> prepopulated_turls;
+ TemplateURLService::OwnedTemplateURLVector local_turls;
+
+ // Start with single search engine created from Play API data.
+ local_turls.push_back(CreatePrepopulateTemplateURL(0, "play", 1, true));
+
+ // Test that prepopulated search engine with matching keyword is merged with
+ // Play API search engine. Search URL should come from Play API search engine.
+ const std::string prepopulated_search_url = "http://prepopulated.url";
+ prepopulated_turls.push_back(CreatePrepopulateTemplateURLData(1, "play"));
+ prepopulated_turls.back()->SetURL(prepopulated_search_url);
+ MergeEnginesFromPrepopulateData(nullptr, &prepopulated_turls, &local_turls,
+ nullptr, nullptr);
+ ASSERT_EQ(local_turls.size(), 1U);
+ // Merged search engine should have both Play API flag and valid
+ // prepopulate_id.
+ EXPECT_TRUE(local_turls[0]->created_from_play_api());
+ EXPECT_EQ(1, local_turls[0]->prepopulate_id());
+ EXPECT_NE(prepopulated_search_url, local_turls[0]->url());
+
+ // Test that merging prepopulated search engine with matching prepopulate_id
+ // preserves keyword of Play API search engine.
+ prepopulated_turls.clear();
+ prepopulated_turls.push_back(CreatePrepopulateTemplateURLData(1, "play2"));
+ MergeEnginesFromPrepopulateData(nullptr, &prepopulated_turls, &local_turls,
+ nullptr, nullptr);
+ ASSERT_EQ(local_turls.size(), 1U);
+ EXPECT_TRUE(local_turls[0]->created_from_play_api());
+ EXPECT_EQ(local_turls[0]->keyword(), u"play");
+
+ // Test that removing search engine from prepopulated list doesn't delete Play
+ // API search engine record.
+ prepopulated_turls.clear();
+ MergeEnginesFromPrepopulateData(nullptr, &prepopulated_turls, &local_turls,
+ nullptr, nullptr);
+ ASSERT_EQ(local_turls.size(), 1U);
+ EXPECT_TRUE(local_turls[0]->created_from_play_api());
+ EXPECT_EQ(local_turls[0]->prepopulate_id(), 0);
+}
+
+// Tests that user modified fields are preserved and overwritten appropriately
+// in MergeIntoEngineData().
+TEST(TemplateURLServiceUtilTest, MergeIntoEngineData) {
+ std::unique_ptr<TemplateURLData> original_turl_data =
+ CreatePrepopulateTemplateURLData(1, "google");
+ std::unique_ptr<TemplateURLData> url_to_update =
+ CreatePrepopulateTemplateURLData(1, "google");
+
+ // Modify the keyword and title for original_turl and set safe_for_autoreplace
+ // to false to simulate a "user edited" template url.
+ original_turl_data->SetShortName(u"modified name");
+ original_turl_data->SetKeyword(u"new keyword");
+ original_turl_data->safe_for_autoreplace = false;
+
+ std::unique_ptr<TemplateURL> original_turl =
+ std::make_unique<TemplateURL>(*original_turl_data);
+
+ // Set `merge_options` to kOverwriteUserEdits. This should NOT preserve the
+ // modified fields. `url_to_update` should keep the default keyword and name
+ // values as well as safe_for_autoreplace being true.
+ MergeIntoEngineData(original_turl.get(), url_to_update.get(),
+ TemplateURLMergeOption::kOverwriteUserEdits);
+
+ EXPECT_TRUE(url_to_update->safe_for_autoreplace);
+ EXPECT_EQ(url_to_update->short_name(), u"Search engine name");
+ EXPECT_EQ(url_to_update->keyword(), u"google");
+
+ // Set `merge_options` to kDefault. This should preserve the modified
+ // keyword and title fields from original_turl and update url_to_update
+ // accordingly.
+ MergeIntoEngineData(original_turl.get(), url_to_update.get(),
+ TemplateURLMergeOption::kDefault);
+
+ EXPECT_FALSE(url_to_update->safe_for_autoreplace);
+ EXPECT_EQ(url_to_update->short_name(), u"modified name");
+ EXPECT_EQ(url_to_update->keyword(), u"new keyword");
+}
projects / platform / framework / web / chromium-efl.git / blobdiff