OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/search_engines/default_search_manager.h" | 5 #include "components/search_engines/default_search_manager.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 | 10 |
11 #include "base/files/scoped_temp_dir.h" | 11 #include "base/files/scoped_temp_dir.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "base/strings/string_split.h" | 13 #include "base/strings/string_split.h" |
14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
16 #include "base/time/time.h" | 16 #include "base/time/time.h" |
17 #include "components/pref_registry/pref_registry_syncable.h" | 17 #include "components/pref_registry/pref_registry_syncable.h" |
18 #include "components/search_engines/search_engines_pref_names.h" | 18 #include "components/search_engines/search_engines_pref_names.h" |
19 #include "components/search_engines/search_engines_test_util.h" | |
19 #include "components/search_engines/template_url_data.h" | 20 #include "components/search_engines/template_url_data.h" |
20 #include "components/search_engines/template_url_data_util.h" | 21 #include "components/search_engines/template_url_data_util.h" |
21 #include "components/search_engines/template_url_prepopulate_data.h" | 22 #include "components/search_engines/template_url_prepopulate_data.h" |
22 #include "components/sync_preferences/testing_pref_service_syncable.h" | 23 #include "components/sync_preferences/testing_pref_service_syncable.h" |
23 #include "testing/gtest/include/gtest/gtest.h" | 24 #include "testing/gtest/include/gtest/gtest.h" |
24 | 25 |
25 namespace { | 26 namespace { |
26 // A dictionary to hold all data related to the Default Search Engine. | 27 // A dictionary to hold all data related to the Default Search Engine. |
27 // Eventually, this should replace all the data stored in the | 28 // Eventually, this should replace all the data stored in the |
28 // default_search_provider.* prefs. | 29 // default_search_provider.* prefs. |
29 const char kDefaultSearchProviderData[] = | 30 const char kDefaultSearchProviderData[] = |
30 "default_search_provider_data.template_url_data"; | 31 "default_search_provider_data.template_url_data"; |
Peter Kasting
2016/12/22 20:49:04
Seems like this could go away and be replaced by D
Alexander Yashkin
2016/12/23 19:44:09
Done.
I thought about it, yet decided to leave un
| |
31 | 32 |
32 // Checks that the two TemplateURLs are similar. Does not check the id or | |
33 // any time-related fields. Neither pointer should be null. | |
34 void ExpectSimilar(const TemplateURLData* expected, | |
35 const TemplateURLData* actual) { | |
36 ASSERT_TRUE(expected != NULL); | |
37 ASSERT_TRUE(actual != NULL); | |
38 | |
39 EXPECT_EQ(expected->short_name(), actual->short_name()); | |
40 EXPECT_EQ(expected->keyword(), actual->keyword()); | |
41 EXPECT_EQ(expected->url(), actual->url()); | |
42 EXPECT_EQ(expected->suggestions_url, actual->suggestions_url); | |
43 EXPECT_EQ(expected->favicon_url, actual->favicon_url); | |
44 EXPECT_EQ(expected->alternate_urls, actual->alternate_urls); | |
45 EXPECT_EQ(expected->safe_for_autoreplace, actual->safe_for_autoreplace); | |
46 EXPECT_EQ(expected->input_encodings, actual->input_encodings); | |
47 EXPECT_EQ(expected->search_terms_replacement_key, | |
48 actual->search_terms_replacement_key); | |
49 } | |
50 | |
51 // TODO(caitkp): TemplateURLData-ify this. | 33 // TODO(caitkp): TemplateURLData-ify this. |
52 void SetOverrides(sync_preferences::TestingPrefServiceSyncable* prefs, | 34 void SetOverrides(sync_preferences::TestingPrefServiceSyncable* prefs, |
53 bool update) { | 35 bool update) { |
54 prefs->SetUserPref(prefs::kSearchProviderOverridesVersion, | 36 prefs->SetUserPref(prefs::kSearchProviderOverridesVersion, |
55 new base::FundamentalValue(1)); | 37 new base::FundamentalValue(1)); |
56 base::ListValue* overrides = new base::ListValue; | 38 base::ListValue* overrides = new base::ListValue; |
57 std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue); | 39 std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue); |
58 | 40 |
59 entry->SetString("name", update ? "new_foo" : "foo"); | 41 entry->SetString("name", update ? "new_foo" : "foo"); |
60 entry->SetString("keyword", update ? "new_fook" : "fook"); | 42 entry->SetString("keyword", update ? "new_fook" : "fook"); |
(...skipping 29 matching lines...) Expand all Loading... | |
90 if (enabled) { | 72 if (enabled) { |
91 EXPECT_FALSE(data->keyword().empty()); | 73 EXPECT_FALSE(data->keyword().empty()); |
92 EXPECT_FALSE(data->url().empty()); | 74 EXPECT_FALSE(data->url().empty()); |
93 } | 75 } |
94 std::unique_ptr<base::DictionaryValue> entry( | 76 std::unique_ptr<base::DictionaryValue> entry( |
95 TemplateURLDataToDictionary(*data)); | 77 TemplateURLDataToDictionary(*data)); |
96 entry->SetBoolean(DefaultSearchManager::kDisabledByPolicy, !enabled); | 78 entry->SetBoolean(DefaultSearchManager::kDisabledByPolicy, !enabled); |
97 prefs->SetManagedPref(kDefaultSearchProviderData, entry.release()); | 79 prefs->SetManagedPref(kDefaultSearchProviderData, entry.release()); |
98 } | 80 } |
99 | 81 |
100 std::unique_ptr<TemplateURLData> GenerateDummyTemplateURLData( | 82 void SetExtensionControlledDefaultSearchEngine( |
101 const std::string& type) { | 83 sync_preferences::TestingPrefServiceSyncable* prefs, |
102 std::unique_ptr<TemplateURLData> data(new TemplateURLData()); | 84 const TemplateURLData& data) { |
Peter Kasting
2016/12/22 20:49:04
Once the pref change I suggested above is made, th
Alexander Yashkin
2016/12/23 19:44:09
I have extracted SetExtensionDefaultSearchInPrefs
| |
103 data->SetShortName(base::UTF8ToUTF16(std::string(type).append("name"))); | 85 std::unique_ptr<base::DictionaryValue> entry( |
Peter Kasting
2016/12/22 20:49:03
Nit: Use =
Alexander Yashkin
2016/12/23 19:44:08
Done
| |
104 data->SetKeyword(base::UTF8ToUTF16(std::string(type).append("key"))); | 86 TemplateURLDataToDictionary(data)); |
105 data->SetURL(std::string("http://").append(type).append("foo/{searchTerms}")); | 87 prefs->SetExtensionPref(kDefaultSearchProviderData, entry.release()); |
106 data->suggestions_url = std::string("http://").append(type).append("sugg"); | |
107 data->alternate_urls.push_back( | |
108 std::string("http://").append(type).append("foo/alt")); | |
109 data->favicon_url = GURL("http://icon1"); | |
110 data->safe_for_autoreplace = true; | |
111 data->input_encodings = base::SplitString( | |
112 "UTF-8;UTF-16", ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); | |
113 data->date_created = base::Time(); | |
114 data->last_modified = base::Time(); | |
115 data->last_visited = base::Time(); | |
116 return data; | |
117 } | 88 } |
118 | 89 |
119 } // namespace | 90 } // namespace |
120 | 91 |
121 class DefaultSearchManagerTest : public testing::Test { | 92 class DefaultSearchManagerTest : public testing::Test { |
122 public: | 93 public: |
123 DefaultSearchManagerTest() {}; | 94 DefaultSearchManagerTest() {}; |
124 | 95 |
125 void SetUp() override { | 96 void SetUp() override { |
126 pref_service_.reset(new sync_preferences::TestingPrefServiceSyncable); | 97 pref_service_.reset(new sync_preferences::TestingPrefServiceSyncable); |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
258 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); | 229 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); |
259 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); | 230 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); |
260 } | 231 } |
261 | 232 |
262 // Test DefaultSearchManager handles extension-controlled DSEs correctly. | 233 // Test DefaultSearchManager handles extension-controlled DSEs correctly. |
263 TEST_F(DefaultSearchManagerTest, DefaultSearchSetByExtension) { | 234 TEST_F(DefaultSearchManagerTest, DefaultSearchSetByExtension) { |
264 DefaultSearchManager manager(pref_service(), | 235 DefaultSearchManager manager(pref_service(), |
265 DefaultSearchManager::ObserverCallback()); | 236 DefaultSearchManager::ObserverCallback()); |
266 std::unique_ptr<TemplateURLData> data = GenerateDummyTemplateURLData("user"); | 237 std::unique_ptr<TemplateURLData> data = GenerateDummyTemplateURLData("user"); |
267 manager.SetUserSelectedDefaultSearchEngine(*data); | 238 manager.SetUserSelectedDefaultSearchEngine(*data); |
268 | |
Peter Kasting
2016/12/22 20:49:04
Nit: I wouldn't remove the blank lines in this tes
Alexander Yashkin
2016/12/23 19:44:08
I dont remember removing them intentionally, maybe
| |
269 DefaultSearchManager::Source source = DefaultSearchManager::FROM_FALLBACK; | 239 DefaultSearchManager::Source source = DefaultSearchManager::FROM_FALLBACK; |
270 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); | 240 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); |
271 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); | 241 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); |
272 | |
273 // Extension trumps prefs: | 242 // Extension trumps prefs: |
274 std::unique_ptr<TemplateURLData> extension_data_1 = | 243 std::unique_ptr<TemplateURLData> extension_data_1 = |
275 GenerateDummyTemplateURLData("ext1"); | 244 GenerateDummyTemplateURLData("ext1"); |
276 manager.SetExtensionControlledDefaultSearchEngine(*extension_data_1); | 245 SetExtensionControlledDefaultSearchEngine(pref_service(), *extension_data_1); |
277 | |
278 ExpectSimilar(extension_data_1.get(), | 246 ExpectSimilar(extension_data_1.get(), |
279 manager.GetDefaultSearchEngine(&source)); | 247 manager.GetDefaultSearchEngine(&source)); |
280 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); | 248 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); |
281 | |
282 // Policy trumps extension: | 249 // Policy trumps extension: |
283 std::unique_ptr<TemplateURLData> policy_data = | 250 std::unique_ptr<TemplateURLData> policy_data = |
284 GenerateDummyTemplateURLData("policy"); | 251 GenerateDummyTemplateURLData("policy"); |
285 SetPolicy(pref_service(), true, policy_data.get()); | 252 SetPolicy(pref_service(), true, policy_data.get()); |
286 | |
287 ExpectSimilar(policy_data.get(), manager.GetDefaultSearchEngine(&source)); | 253 ExpectSimilar(policy_data.get(), manager.GetDefaultSearchEngine(&source)); |
288 EXPECT_EQ(DefaultSearchManager::FROM_POLICY, source); | 254 EXPECT_EQ(DefaultSearchManager::FROM_POLICY, source); |
289 pref_service()->RemoveManagedPref(kDefaultSearchProviderData); | 255 pref_service()->RemoveManagedPref(kDefaultSearchProviderData); |
290 | |
291 // Extensions trump each other: | 256 // Extensions trump each other: |
292 std::unique_ptr<TemplateURLData> extension_data_2 = | 257 std::unique_ptr<TemplateURLData> extension_data_2 = |
293 GenerateDummyTemplateURLData("ext2"); | 258 GenerateDummyTemplateURLData("ext2"); |
294 std::unique_ptr<TemplateURLData> extension_data_3 = | 259 std::unique_ptr<TemplateURLData> extension_data_3 = |
295 GenerateDummyTemplateURLData("ext3"); | 260 GenerateDummyTemplateURLData("ext3"); |
296 manager.SetExtensionControlledDefaultSearchEngine(*extension_data_2); | 261 SetExtensionControlledDefaultSearchEngine(pref_service(), *extension_data_2); |
297 manager.SetExtensionControlledDefaultSearchEngine(*extension_data_3); | 262 SetExtensionControlledDefaultSearchEngine(pref_service(), *extension_data_3); |
298 | |
299 ExpectSimilar(extension_data_3.get(), | 263 ExpectSimilar(extension_data_3.get(), |
300 manager.GetDefaultSearchEngine(&source)); | 264 manager.GetDefaultSearchEngine(&source)); |
301 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); | 265 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); |
302 | 266 pref_service()->RemoveExtensionPref(kDefaultSearchProviderData); |
303 manager.ClearExtensionControlledDefaultSearchEngine(); | |
304 | |
305 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); | 267 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); |
306 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); | 268 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); |
307 } | 269 } |
OLD | NEW |