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/pref_registry/testing_pref_service_syncable.h" | 18 #include "components/pref_registry/testing_pref_service_syncable.h" |
19 #include "components/search_engines/search_engines_pref_names.h" | 19 #include "components/search_engines/search_engines_pref_names.h" |
20 #include "components/search_engines/template_url_data.h" | 20 #include "components/search_engines/template_url_data.h" |
21 #include "components/search_engines/template_url_prepopulate_data.h" | 21 #include "components/search_engines/template_url_prepopulate_data.h" |
22 #include "components/search_engines/util.h" | |
22 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
23 | 24 |
24 namespace { | 25 namespace { |
25 // A dictionary to hold all data related to the Default Search Engine. | 26 // A dictionary to hold all data related to the Default Search Engine. |
26 // Eventually, this should replace all the data stored in the | 27 // Eventually, this should replace all the data stored in the |
27 // default_search_provider.* prefs. | 28 // default_search_provider.* prefs. |
28 const char kDefaultSearchProviderData[] = | 29 const char kDefaultSearchProviderData[] = |
29 "default_search_provider_data.template_url_data"; | 30 "default_search_provider_data.template_url_data"; |
30 | 31 |
31 // Checks that the two TemplateURLs are similar. Does not check the id, the | 32 // Checks that the two TemplateURLs are similar. Does not check the id, the |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
83 prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides); | 84 prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides); |
84 } | 85 } |
85 | 86 |
86 void SetPolicy(user_prefs::TestingPrefServiceSyncable* prefs, | 87 void SetPolicy(user_prefs::TestingPrefServiceSyncable* prefs, |
87 bool enabled, | 88 bool enabled, |
88 TemplateURLData* data) { | 89 TemplateURLData* data) { |
89 if (enabled) { | 90 if (enabled) { |
90 EXPECT_FALSE(data->keyword().empty()); | 91 EXPECT_FALSE(data->keyword().empty()); |
91 EXPECT_FALSE(data->url().empty()); | 92 EXPECT_FALSE(data->url().empty()); |
92 } | 93 } |
93 std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue); | 94 std::unique_ptr<base::DictionaryValue> entry( |
94 entry->SetString(DefaultSearchManager::kShortName, data->short_name()); | 95 TemplateUrlDataToDictionary(*data)); |
95 entry->SetString(DefaultSearchManager::kKeyword, data->keyword()); | |
96 entry->SetString(DefaultSearchManager::kURL, data->url()); | |
97 entry->SetString(DefaultSearchManager::kFaviconURL, data->favicon_url.spec()); | |
98 entry->SetString(DefaultSearchManager::kSuggestionsURL, | |
99 data->suggestions_url); | |
100 entry->SetBoolean(DefaultSearchManager::kSafeForAutoReplace, | |
101 data->safe_for_autoreplace); | |
102 std::unique_ptr<base::ListValue> alternate_urls(new base::ListValue); | |
103 for (std::vector<std::string>::const_iterator it = | |
104 data->alternate_urls.begin(); | |
105 it != data->alternate_urls.end(); | |
106 ++it) { | |
107 alternate_urls->AppendString(*it); | |
108 } | |
109 entry->Set(DefaultSearchManager::kAlternateURLs, alternate_urls.release()); | |
110 | |
111 std::unique_ptr<base::ListValue> encodings(new base::ListValue); | |
112 for (std::vector<std::string>::const_iterator it = | |
113 data->input_encodings.begin(); | |
114 it != data->input_encodings.end(); | |
115 ++it) { | |
116 encodings->AppendString(*it); | |
117 } | |
118 entry->Set(DefaultSearchManager::kInputEncodings, encodings.release()); | |
119 | |
120 entry->SetString(DefaultSearchManager::kSearchTermsReplacementKey, | |
121 data->search_terms_replacement_key); | |
122 entry->SetBoolean(DefaultSearchManager::kDisabledByPolicy, !enabled); | 96 entry->SetBoolean(DefaultSearchManager::kDisabledByPolicy, !enabled); |
123 prefs->SetManagedPref(kDefaultSearchProviderData, entry.release()); | 97 prefs->SetManagedPref(kDefaultSearchProviderData, entry.release()); |
124 } | 98 } |
125 | 99 |
100 void SetExtensionControlledDSE(const std::string& extension_id, | |
101 user_prefs::TestingPrefServiceSyncable* prefs, | |
102 TemplateURLData* data) { | |
103 | |
104 } | |
105 | |
106 void ClearExtensionControlledDSE( | |
107 user_prefs::TestingPrefServiceSyncable* prefs) { | |
108 | |
109 } | |
vasilii
2016/11/09 14:29:56
Why are they empty?
Alexander Yashkin
2016/11/28 19:16:17
I was thinking at first to modify this unittest to
| |
110 | |
126 std::unique_ptr<TemplateURLData> GenerateDummyTemplateURLData( | 111 std::unique_ptr<TemplateURLData> GenerateDummyTemplateURLData( |
127 const std::string& type) { | 112 const std::string& type) { |
128 std::unique_ptr<TemplateURLData> data(new TemplateURLData()); | 113 std::unique_ptr<TemplateURLData> data(new TemplateURLData()); |
129 data->SetShortName(base::UTF8ToUTF16(std::string(type).append("name"))); | 114 data->SetShortName(base::UTF8ToUTF16(std::string(type).append("name"))); |
130 data->SetKeyword(base::UTF8ToUTF16(std::string(type).append("key"))); | 115 data->SetKeyword(base::UTF8ToUTF16(std::string(type).append("key"))); |
131 data->SetURL(std::string("http://").append(type).append("foo/{searchTerms}")); | 116 data->SetURL(std::string("http://").append(type).append("foo/{searchTerms}")); |
132 data->suggestions_url = std::string("http://").append(type).append("sugg"); | 117 data->suggestions_url = std::string("http://").append(type).append("sugg"); |
133 data->alternate_urls.push_back( | 118 data->alternate_urls.push_back( |
134 std::string("http://").append(type).append("foo/alt")); | 119 std::string("http://").append(type).append("foo/alt")); |
135 data->favicon_url = GURL("http://icon1"); | 120 data->favicon_url = GURL("http://icon1"); |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
278 TemplateURLData null_policy_data; | 263 TemplateURLData null_policy_data; |
279 SetPolicy(pref_service(), false, &null_policy_data); | 264 SetPolicy(pref_service(), false, &null_policy_data); |
280 EXPECT_EQ(NULL, manager.GetDefaultSearchEngine(&source)); | 265 EXPECT_EQ(NULL, manager.GetDefaultSearchEngine(&source)); |
281 EXPECT_EQ(DefaultSearchManager::FROM_POLICY, source); | 266 EXPECT_EQ(DefaultSearchManager::FROM_POLICY, source); |
282 | 267 |
283 pref_service()->RemoveManagedPref(kDefaultSearchProviderData); | 268 pref_service()->RemoveManagedPref(kDefaultSearchProviderData); |
284 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); | 269 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); |
285 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); | 270 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); |
286 } | 271 } |
287 | 272 |
273 | |
274 class DefaultSearchManagerExensionControlled : public testing::Test { | |
275 void SetUp() override { | |
276 pref_service_.reset(new user_prefs::TestingPrefServiceSyncable); | |
277 DefaultSearchManager::RegisterProfilePrefs(pref_service_->registry()); | |
278 TemplateURLPrepopulateData::RegisterProfilePrefs(pref_service_->registry()); | |
279 } | |
280 | |
281 user_prefs::TestingPrefServiceSyncable* pref_service() { | |
282 return pref_service_.get(); | |
283 } | |
284 | |
285 private: | |
286 std::unique_ptr<user_prefs::TestingPrefServiceSyncable> pref_service_; | |
287 | |
288 DISALLOW_COPY_AND_ASSIGN(DefaultSearchManagerExensionControlled); | |
289 }; | |
290 | |
288 // Test DefaultSearchManager handles extension-controlled DSEs correctly. | 291 // Test DefaultSearchManager handles extension-controlled DSEs correctly. |
289 TEST_F(DefaultSearchManagerTest, DefaultSearchSetByExtension) { | 292 TEST_F(DefaultSearchManagerExensionControlled, DefaultSearchSetByExtension) { |
290 DefaultSearchManager manager(pref_service(), | 293 DefaultSearchManager manager(pref_service(), |
291 DefaultSearchManager::ObserverCallback()); | 294 DefaultSearchManager::ObserverCallback()); |
292 std::unique_ptr<TemplateURLData> data = GenerateDummyTemplateURLData("user"); | 295 std::unique_ptr<TemplateURLData> data = GenerateDummyTemplateURLData("user"); |
293 manager.SetUserSelectedDefaultSearchEngine(*data); | 296 manager.SetUserSelectedDefaultSearchEngine(*data); |
294 | 297 |
295 DefaultSearchManager::Source source = DefaultSearchManager::FROM_FALLBACK; | 298 DefaultSearchManager::Source source = DefaultSearchManager::FROM_FALLBACK; |
296 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); | 299 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); |
297 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); | 300 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); |
298 | 301 |
299 // Extension trumps prefs: | 302 // Extension trumps prefs: |
300 std::unique_ptr<TemplateURLData> extension_data_1 = | 303 std::unique_ptr<TemplateURLData> extension_data_1 = |
301 GenerateDummyTemplateURLData("ext1"); | 304 GenerateDummyTemplateURLData("ext1"); |
302 manager.SetExtensionControlledDefaultSearchEngine(*extension_data_1); | 305 // manager.SetExtensionControlledDefaultSearchEngine(*extension_data_1); |
vasilii
2016/11/09 14:29:56
Looks like you wanted to change something in this
Alexander Yashkin
2016/11/28 19:16:17
Deleted, see comment above.
| |
306 SetExtensionControlledDSE("ext_id1", pref_service(), extension_data_1.get()); | |
303 | 307 |
304 ExpectSimilar(extension_data_1.get(), | 308 ExpectSimilar(extension_data_1.get(), |
305 manager.GetDefaultSearchEngine(&source)); | 309 manager.GetDefaultSearchEngine(&source)); |
306 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); | 310 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); |
307 | 311 |
308 // Policy trumps extension: | 312 // Policy trumps extension: |
309 std::unique_ptr<TemplateURLData> policy_data = | 313 std::unique_ptr<TemplateURLData> policy_data = |
310 GenerateDummyTemplateURLData("policy"); | 314 GenerateDummyTemplateURLData("policy"); |
311 SetPolicy(pref_service(), true, policy_data.get()); | 315 SetPolicy(pref_service(), true, policy_data.get()); |
312 | 316 |
313 ExpectSimilar(policy_data.get(), manager.GetDefaultSearchEngine(&source)); | 317 ExpectSimilar(policy_data.get(), manager.GetDefaultSearchEngine(&source)); |
314 EXPECT_EQ(DefaultSearchManager::FROM_POLICY, source); | 318 EXPECT_EQ(DefaultSearchManager::FROM_POLICY, source); |
315 pref_service()->RemoveManagedPref(kDefaultSearchProviderData); | 319 pref_service()->RemoveManagedPref(kDefaultSearchProviderData); |
316 | 320 |
317 // Extensions trump each other: | 321 // Extensions trump each other: |
318 std::unique_ptr<TemplateURLData> extension_data_2 = | 322 std::unique_ptr<TemplateURLData> extension_data_2 = |
319 GenerateDummyTemplateURLData("ext2"); | 323 GenerateDummyTemplateURLData("ext2"); |
320 std::unique_ptr<TemplateURLData> extension_data_3 = | 324 std::unique_ptr<TemplateURLData> extension_data_3 = |
321 GenerateDummyTemplateURLData("ext3"); | 325 GenerateDummyTemplateURLData("ext3"); |
322 manager.SetExtensionControlledDefaultSearchEngine(*extension_data_2); | 326 //manager.SetExtensionControlledDefaultSearchEngine(*extension_data_2); |
323 manager.SetExtensionControlledDefaultSearchEngine(*extension_data_3); | 327 SetExtensionControlledDSE("ext_id2", pref_service(), extension_data_2.get()); |
328 //manager.SetExtensionControlledDefaultSearchEngine(*extension_data_3); | |
329 SetExtensionControlledDSE("ext_id3", pref_service(), extension_data_3.get); | |
324 | 330 |
325 ExpectSimilar(extension_data_3.get(), | 331 ExpectSimilar(extension_data_3.get(), |
326 manager.GetDefaultSearchEngine(&source)); | 332 manager.GetDefaultSearchEngine(&source)); |
327 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); | 333 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); |
328 | 334 |
329 manager.ClearExtensionControlledDefaultSearchEngine(); | 335 // manager.ClearExtensionControlledDefaultSearchEngine(); |
336 ClearExtensionControlledDSE(pref_service()); | |
330 | 337 |
331 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); | 338 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); |
332 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); | 339 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); |
333 } | 340 } |
OLD | NEW |