Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: components/search_engines/default_search_manager_unittest.cc

Issue 2479113002: Make extensions DSE persistent in browser prefs (Closed)
Patch Set: Fixed default extension keywords conflicts problem Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/default_search_manager.h"
18 #include "components/search_engines/search_engines_pref_names.h" 19 #include "components/search_engines/search_engines_pref_names.h"
20 #include "components/search_engines/search_engines_test_util.h"
19 #include "components/search_engines/template_url_data.h" 21 #include "components/search_engines/template_url_data.h"
20 #include "components/search_engines/template_url_data_util.h" 22 #include "components/search_engines/template_url_data_util.h"
21 #include "components/search_engines/template_url_prepopulate_data.h" 23 #include "components/search_engines/template_url_prepopulate_data.h"
22 #include "components/sync_preferences/testing_pref_service_syncable.h" 24 #include "components/sync_preferences/testing_pref_service_syncable.h"
23 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
24 26
25 namespace { 27 namespace {
26 // A dictionary to hold all data related to the Default Search Engine.
27 // Eventually, this should replace all the data stored in the
28 // default_search_provider.* prefs.
29 const char kDefaultSearchProviderData[] =
30 "default_search_provider_data.template_url_data";
31
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 28
51 // TODO(caitkp): TemplateURLData-ify this. 29 // TODO(caitkp): TemplateURLData-ify this.
52 void SetOverrides(sync_preferences::TestingPrefServiceSyncable* prefs, 30 void SetOverrides(sync_preferences::TestingPrefServiceSyncable* prefs,
53 bool update) { 31 bool update) {
54 prefs->SetUserPref(prefs::kSearchProviderOverridesVersion, 32 prefs->SetUserPref(prefs::kSearchProviderOverridesVersion,
55 new base::FundamentalValue(1)); 33 new base::FundamentalValue(1));
56 base::ListValue* overrides = new base::ListValue; 34 base::ListValue* overrides = new base::ListValue;
57 std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue); 35 std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
58 36
59 entry->SetString("name", update ? "new_foo" : "foo"); 37 entry->SetString("name", update ? "new_foo" : "foo");
(...skipping 27 matching lines...) Expand all
87 void SetPolicy(sync_preferences::TestingPrefServiceSyncable* prefs, 65 void SetPolicy(sync_preferences::TestingPrefServiceSyncable* prefs,
88 bool enabled, 66 bool enabled,
89 TemplateURLData* data) { 67 TemplateURLData* data) {
90 if (enabled) { 68 if (enabled) {
91 EXPECT_FALSE(data->keyword().empty()); 69 EXPECT_FALSE(data->keyword().empty());
92 EXPECT_FALSE(data->url().empty()); 70 EXPECT_FALSE(data->url().empty());
93 } 71 }
94 std::unique_ptr<base::DictionaryValue> entry( 72 std::unique_ptr<base::DictionaryValue> entry(
95 TemplateURLDataToDictionary(*data)); 73 TemplateURLDataToDictionary(*data));
96 entry->SetBoolean(DefaultSearchManager::kDisabledByPolicy, !enabled); 74 entry->SetBoolean(DefaultSearchManager::kDisabledByPolicy, !enabled);
97 prefs->SetManagedPref(kDefaultSearchProviderData, entry.release()); 75 prefs->SetManagedPref(
98 } 76 DefaultSearchManager::kDefaultSearchProviderDataPrefName,
99 77 entry.release());
100 std::unique_ptr<TemplateURLData> GenerateDummyTemplateURLData(
101 const std::string& type) {
102 std::unique_ptr<TemplateURLData> data(new TemplateURLData());
103 data->SetShortName(base::UTF8ToUTF16(std::string(type).append("name")));
104 data->SetKeyword(base::UTF8ToUTF16(std::string(type).append("key")));
105 data->SetURL(std::string("http://").append(type).append("foo/{searchTerms}"));
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 } 78 }
118 79
119 } // namespace 80 } // namespace
120 81
121 class DefaultSearchManagerTest : public testing::Test { 82 class DefaultSearchManagerTest : public testing::Test {
122 public: 83 public:
123 DefaultSearchManagerTest() {}; 84 DefaultSearchManagerTest() {};
124 85
125 void SetUp() override { 86 void SetUp() override {
126 pref_service_.reset(new sync_preferences::TestingPrefServiceSyncable); 87 pref_service_.reset(new sync_preferences::TestingPrefServiceSyncable);
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 SetPolicy(pref_service(), true, policy_data.get()); 208 SetPolicy(pref_service(), true, policy_data.get());
248 209
249 ExpectSimilar(policy_data.get(), manager.GetDefaultSearchEngine(&source)); 210 ExpectSimilar(policy_data.get(), manager.GetDefaultSearchEngine(&source));
250 EXPECT_EQ(DefaultSearchManager::FROM_POLICY, source); 211 EXPECT_EQ(DefaultSearchManager::FROM_POLICY, source);
251 212
252 TemplateURLData null_policy_data; 213 TemplateURLData null_policy_data;
253 SetPolicy(pref_service(), false, &null_policy_data); 214 SetPolicy(pref_service(), false, &null_policy_data);
254 EXPECT_EQ(NULL, manager.GetDefaultSearchEngine(&source)); 215 EXPECT_EQ(NULL, manager.GetDefaultSearchEngine(&source));
255 EXPECT_EQ(DefaultSearchManager::FROM_POLICY, source); 216 EXPECT_EQ(DefaultSearchManager::FROM_POLICY, source);
256 217
257 pref_service()->RemoveManagedPref(kDefaultSearchProviderData); 218 pref_service()->RemoveManagedPref(
219 DefaultSearchManager::kDefaultSearchProviderDataPrefName);
258 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); 220 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source));
259 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); 221 EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
260 } 222 }
261 223
262 // Test DefaultSearchManager handles extension-controlled DSEs correctly. 224 // Test DefaultSearchManager handles extension-controlled DSEs correctly.
263 TEST_F(DefaultSearchManagerTest, DefaultSearchSetByExtension) { 225 TEST_F(DefaultSearchManagerTest, DefaultSearchSetByExtension) {
264 DefaultSearchManager manager(pref_service(), 226 DefaultSearchManager manager(pref_service(),
265 DefaultSearchManager::ObserverCallback()); 227 DefaultSearchManager::ObserverCallback());
266 std::unique_ptr<TemplateURLData> data = GenerateDummyTemplateURLData("user"); 228 std::unique_ptr<TemplateURLData> data = GenerateDummyTemplateURLData("user");
267 manager.SetUserSelectedDefaultSearchEngine(*data); 229 manager.SetUserSelectedDefaultSearchEngine(*data);
268 230
269 DefaultSearchManager::Source source = DefaultSearchManager::FROM_FALLBACK; 231 DefaultSearchManager::Source source = DefaultSearchManager::FROM_FALLBACK;
270 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); 232 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source));
271 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); 233 EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
272 234
273 // Extension trumps prefs: 235 // Extension trumps prefs:
274 std::unique_ptr<TemplateURLData> extension_data_1 = 236 std::unique_ptr<TemplateURLData> extension_data_1 =
275 GenerateDummyTemplateURLData("ext1"); 237 GenerateDummyTemplateURLData("ext1");
276 manager.SetExtensionControlledDefaultSearchEngine(*extension_data_1); 238 SetExtensionDefaultSearchInPrefs(pref_service(), *extension_data_1, "ext1");
277
278 ExpectSimilar(extension_data_1.get(), 239 ExpectSimilar(extension_data_1.get(),
279 manager.GetDefaultSearchEngine(&source)); 240 manager.GetDefaultSearchEngine(&source));
280 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); 241 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source);
281 242
282 // Policy trumps extension: 243 // Policy trumps extension:
283 std::unique_ptr<TemplateURLData> policy_data = 244 std::unique_ptr<TemplateURLData> policy_data =
284 GenerateDummyTemplateURLData("policy"); 245 GenerateDummyTemplateURLData("policy");
285 SetPolicy(pref_service(), true, policy_data.get()); 246 SetPolicy(pref_service(), true, policy_data.get());
286 247
287 ExpectSimilar(policy_data.get(), manager.GetDefaultSearchEngine(&source)); 248 ExpectSimilar(policy_data.get(), manager.GetDefaultSearchEngine(&source));
288 EXPECT_EQ(DefaultSearchManager::FROM_POLICY, source); 249 EXPECT_EQ(DefaultSearchManager::FROM_POLICY, source);
289 pref_service()->RemoveManagedPref(kDefaultSearchProviderData); 250 pref_service()->RemoveManagedPref(
251 DefaultSearchManager::kDefaultSearchProviderDataPrefName);
290 252
291 // Extensions trump each other: 253 // Extensions trump each other:
292 std::unique_ptr<TemplateURLData> extension_data_2 = 254 std::unique_ptr<TemplateURLData> extension_data_2 =
293 GenerateDummyTemplateURLData("ext2"); 255 GenerateDummyTemplateURLData("ext2");
294 std::unique_ptr<TemplateURLData> extension_data_3 = 256 std::unique_ptr<TemplateURLData> extension_data_3 =
295 GenerateDummyTemplateURLData("ext3"); 257 GenerateDummyTemplateURLData("ext3");
296 manager.SetExtensionControlledDefaultSearchEngine(*extension_data_2);
297 manager.SetExtensionControlledDefaultSearchEngine(*extension_data_3);
298 258
259 SetExtensionDefaultSearchInPrefs(pref_service(), *extension_data_2, "ext2");
260 SetExtensionDefaultSearchInPrefs(pref_service(), *extension_data_3, "ext3");
299 ExpectSimilar(extension_data_3.get(), 261 ExpectSimilar(extension_data_3.get(),
300 manager.GetDefaultSearchEngine(&source)); 262 manager.GetDefaultSearchEngine(&source));
301 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); 263 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source);
302 264
303 manager.ClearExtensionControlledDefaultSearchEngine(); 265 RemoveExtensionDefaultSearchFromPrefs(pref_service());
304
305 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); 266 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source));
306 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); 267 EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
307 } 268 }
OLDNEW
« no previous file with comments | « components/search_engines/default_search_manager.cc ('k') | components/search_engines/search_engines_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698