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

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

Issue 2497853002: Create TemplateUrlData to base::Dictionary utility functions (Closed)
Patch Set: Updates after review discussion, just rip out common functions Created 4 years, 1 month 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/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_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 "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
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
126 std::unique_ptr<TemplateURLData> GenerateDummyTemplateURLData( 100 std::unique_ptr<TemplateURLData> GenerateDummyTemplateURLData(
127 const std::string& type) { 101 const std::string& type) {
128 std::unique_ptr<TemplateURLData> data(new TemplateURLData()); 102 std::unique_ptr<TemplateURLData> data(new TemplateURLData());
129 data->SetShortName(base::UTF8ToUTF16(std::string(type).append("name"))); 103 data->SetShortName(base::UTF8ToUTF16(std::string(type).append("name")));
130 data->SetKeyword(base::UTF8ToUTF16(std::string(type).append("key"))); 104 data->SetKeyword(base::UTF8ToUTF16(std::string(type).append("key")));
131 data->SetURL(std::string("http://").append(type).append("foo/{searchTerms}")); 105 data->SetURL(std::string("http://").append(type).append("foo/{searchTerms}"));
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 298
325 ExpectSimilar(extension_data_3.get(), 299 ExpectSimilar(extension_data_3.get(),
326 manager.GetDefaultSearchEngine(&source)); 300 manager.GetDefaultSearchEngine(&source));
327 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); 301 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source);
328 302
329 manager.ClearExtensionControlledDefaultSearchEngine(); 303 manager.ClearExtensionControlledDefaultSearchEngine();
330 304
331 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); 305 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source));
332 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); 306 EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
333 } 307 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698