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

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

Issue 2889163002: Remove raw DictionaryValue::Set in //components (Closed)
Patch Set: Nits Created 3 years, 6 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 #include <utility> 10 #include <utility>
(...skipping 16 matching lines...) Expand all
27 #include "testing/gtest/include/gtest/gtest.h" 27 #include "testing/gtest/include/gtest/gtest.h"
28 28
29 namespace { 29 namespace {
30 30
31 // TODO(caitkp): TemplateURLData-ify this. 31 // TODO(caitkp): TemplateURLData-ify this.
32 void SetOverrides(sync_preferences::TestingPrefServiceSyncable* prefs, 32 void SetOverrides(sync_preferences::TestingPrefServiceSyncable* prefs,
33 bool update) { 33 bool update) {
34 prefs->SetUserPref(prefs::kSearchProviderOverridesVersion, 34 prefs->SetUserPref(prefs::kSearchProviderOverridesVersion,
35 base::MakeUnique<base::Value>(1)); 35 base::MakeUnique<base::Value>(1));
36 auto overrides = base::MakeUnique<base::ListValue>(); 36 auto overrides = base::MakeUnique<base::ListValue>();
37 std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue); 37 auto entry = base::MakeUnique<base::DictionaryValue>();
38 38
39 entry->SetString("name", update ? "new_foo" : "foo"); 39 entry->SetString("name", update ? "new_foo" : "foo");
40 entry->SetString("keyword", update ? "new_fook" : "fook"); 40 entry->SetString("keyword", update ? "new_fook" : "fook");
41 entry->SetString("search_url", "http://foo.com/s?q={searchTerms}"); 41 entry->SetString("search_url", "http://foo.com/s?q={searchTerms}");
42 entry->SetString("favicon_url", "http://foi.com/favicon.ico"); 42 entry->SetString("favicon_url", "http://foi.com/favicon.ico");
43 entry->SetString("encoding", "UTF-8"); 43 entry->SetString("encoding", "UTF-8");
44 entry->SetInteger("id", 1001); 44 entry->SetInteger("id", 1001);
45 entry->SetString("suggest_url", "http://foo.com/suggest?q={searchTerms}"); 45 entry->SetString("suggest_url", "http://foo.com/suggest?q={searchTerms}");
46 entry->SetString("instant_url", "http://foo.com/instant?q={searchTerms}"); 46 entry->SetString("instant_url", "http://foo.com/instant?q={searchTerms}");
47 base::ListValue* alternate_urls = new base::ListValue; 47 auto alternate_urls = base::MakeUnique<base::ListValue>();
48 alternate_urls->AppendString("http://foo.com/alternate?q={searchTerms}"); 48 alternate_urls->AppendString("http://foo.com/alternate?q={searchTerms}");
49 entry->Set("alternate_urls", alternate_urls); 49 entry->Set("alternate_urls", std::move(alternate_urls));
50 entry->SetString("search_terms_replacement_key", "espv"); 50 entry->SetString("search_terms_replacement_key", "espv");
51 overrides->Append(entry->CreateDeepCopy()); 51 overrides->Append(std::move(entry));
52 52
53 entry.reset(new base::DictionaryValue); 53 entry = base::MakeUnique<base::DictionaryValue>();
54 entry->SetInteger("id", 1002); 54 entry->SetInteger("id", 1002);
55 entry->SetString("name", update ? "new_bar" : "bar"); 55 entry->SetString("name", update ? "new_bar" : "bar");
56 entry->SetString("keyword", update ? "new_bark" : "bark"); 56 entry->SetString("keyword", update ? "new_bark" : "bark");
57 entry->SetString("encoding", std::string()); 57 entry->SetString("encoding", std::string());
58 overrides->Append(entry->CreateDeepCopy()); 58 overrides->Append(base::MakeUnique<base::Value>(*entry));
59 entry->SetInteger("id", 1003); 59 entry->SetInteger("id", 1003);
60 entry->SetString("name", "baz"); 60 entry->SetString("name", "baz");
61 entry->SetString("keyword", "bazk"); 61 entry->SetString("keyword", "bazk");
62 entry->SetString("encoding", "UTF-8"); 62 entry->SetString("encoding", "UTF-8");
63 overrides->Append(entry->CreateDeepCopy()); 63 overrides->Append(std::move(entry));
64 prefs->SetUserPref(prefs::kSearchProviderOverrides, std::move(overrides)); 64 prefs->SetUserPref(prefs::kSearchProviderOverrides, std::move(overrides));
65 } 65 }
66 66
67 void SetPolicy(sync_preferences::TestingPrefServiceSyncable* prefs, 67 void SetPolicy(sync_preferences::TestingPrefServiceSyncable* prefs,
68 bool enabled, 68 bool enabled,
69 TemplateURLData* data) { 69 TemplateURLData* data) {
70 if (enabled) { 70 if (enabled) {
71 EXPECT_FALSE(data->keyword().empty()); 71 EXPECT_FALSE(data->keyword().empty());
72 EXPECT_FALSE(data->url().empty()); 72 EXPECT_FALSE(data->url().empty());
73 } 73 }
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 SetExtensionDefaultSearchInPrefs(pref_service(), *extension_data_2); 261 SetExtensionDefaultSearchInPrefs(pref_service(), *extension_data_2);
262 SetExtensionDefaultSearchInPrefs(pref_service(), *extension_data_3); 262 SetExtensionDefaultSearchInPrefs(pref_service(), *extension_data_3);
263 ExpectSimilar(extension_data_3.get(), 263 ExpectSimilar(extension_data_3.get(),
264 manager.GetDefaultSearchEngine(&source)); 264 manager.GetDefaultSearchEngine(&source));
265 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); 265 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source);
266 266
267 RemoveExtensionDefaultSearchFromPrefs(pref_service()); 267 RemoveExtensionDefaultSearchFromPrefs(pref_service());
268 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); 268 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source));
269 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); 269 EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
270 } 270 }
OLDNEW
« no previous file with comments | « components/proximity_auth/screenlock_bridge.cc ('k') | components/search_engines/default_search_policy_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698