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

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

Issue 2287733002: Switch //components away from base::ListValue::Append(Value*) overload. (Closed)
Patch Set: Test fix Created 4 years, 3 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
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 entry->SetString("search_url", "http://foo.com/s?q={searchTerms}"); 60 entry->SetString("search_url", "http://foo.com/s?q={searchTerms}");
61 entry->SetString("favicon_url", "http://foi.com/favicon.ico"); 61 entry->SetString("favicon_url", "http://foi.com/favicon.ico");
62 entry->SetString("encoding", "UTF-8"); 62 entry->SetString("encoding", "UTF-8");
63 entry->SetInteger("id", 1001); 63 entry->SetInteger("id", 1001);
64 entry->SetString("suggest_url", "http://foo.com/suggest?q={searchTerms}"); 64 entry->SetString("suggest_url", "http://foo.com/suggest?q={searchTerms}");
65 entry->SetString("instant_url", "http://foo.com/instant?q={searchTerms}"); 65 entry->SetString("instant_url", "http://foo.com/instant?q={searchTerms}");
66 base::ListValue* alternate_urls = new base::ListValue; 66 base::ListValue* alternate_urls = new base::ListValue;
67 alternate_urls->AppendString("http://foo.com/alternate?q={searchTerms}"); 67 alternate_urls->AppendString("http://foo.com/alternate?q={searchTerms}");
68 entry->Set("alternate_urls", alternate_urls); 68 entry->Set("alternate_urls", alternate_urls);
69 entry->SetString("search_terms_replacement_key", "espv"); 69 entry->SetString("search_terms_replacement_key", "espv");
70 overrides->Append(entry->DeepCopy()); 70 overrides->Append(entry->CreateDeepCopy());
71 71
72 entry.reset(new base::DictionaryValue); 72 entry.reset(new base::DictionaryValue);
73 entry->SetInteger("id", 1002); 73 entry->SetInteger("id", 1002);
74 entry->SetString("name", update ? "new_bar" : "bar"); 74 entry->SetString("name", update ? "new_bar" : "bar");
75 entry->SetString("keyword", update ? "new_bark" : "bark"); 75 entry->SetString("keyword", update ? "new_bark" : "bark");
76 entry->SetString("encoding", std::string()); 76 entry->SetString("encoding", std::string());
77 overrides->Append(entry->DeepCopy()); 77 overrides->Append(entry->CreateDeepCopy());
78 entry->SetInteger("id", 1003); 78 entry->SetInteger("id", 1003);
79 entry->SetString("name", "baz"); 79 entry->SetString("name", "baz");
80 entry->SetString("keyword", "bazk"); 80 entry->SetString("keyword", "bazk");
81 entry->SetString("encoding", "UTF-8"); 81 entry->SetString("encoding", "UTF-8");
82 overrides->Append(entry->DeepCopy()); 82 overrides->Append(entry->CreateDeepCopy());
83 prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides); 83 prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides);
84 } 84 }
85 85
86 void SetPolicy(user_prefs::TestingPrefServiceSyncable* prefs, 86 void SetPolicy(user_prefs::TestingPrefServiceSyncable* prefs,
87 bool enabled, 87 bool enabled,
88 TemplateURLData* data) { 88 TemplateURLData* data) {
89 if (enabled) { 89 if (enabled) {
90 EXPECT_FALSE(data->keyword().empty()); 90 EXPECT_FALSE(data->keyword().empty());
91 EXPECT_FALSE(data->url().empty()); 91 EXPECT_FALSE(data->url().empty());
92 } 92 }
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 324
325 ExpectSimilar(extension_data_3.get(), 325 ExpectSimilar(extension_data_3.get(),
326 manager.GetDefaultSearchEngine(&source)); 326 manager.GetDefaultSearchEngine(&source));
327 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); 327 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source);
328 328
329 manager.ClearExtensionControlledDefaultSearchEngine(); 329 manager.ClearExtensionControlledDefaultSearchEngine();
330 330
331 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); 331 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source));
332 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); 332 EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
333 } 333 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698