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_pref_test_util.h" | 5 #include "components/search_engines/default_search_pref_test_util.h" |
6 | 6 |
7 #include "base/strings/string_split.h" | 7 #include "base/strings/string_split.h" |
8 #include "components/search_engines/default_search_manager.h" | 8 #include "components/search_engines/default_search_manager.h" |
9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
10 | 10 |
(...skipping 23 matching lines...) Expand all Loading... |
34 new base::StringValue(keyword)); | 34 new base::StringValue(keyword)); |
35 value->Set(DefaultSearchManager::kURL, | 35 value->Set(DefaultSearchManager::kURL, |
36 new base::StringValue(search_url)); | 36 new base::StringValue(search_url)); |
37 value->Set(DefaultSearchManager::kSuggestionsURL, | 37 value->Set(DefaultSearchManager::kSuggestionsURL, |
38 new base::StringValue(suggest_url)); | 38 new base::StringValue(suggest_url)); |
39 value->Set(DefaultSearchManager::kFaviconURL, | 39 value->Set(DefaultSearchManager::kFaviconURL, |
40 new base::StringValue(icon_url)); | 40 new base::StringValue(icon_url)); |
41 value->Set(DefaultSearchManager::kSearchTermsReplacementKey, | 41 value->Set(DefaultSearchManager::kSearchTermsReplacementKey, |
42 new base::StringValue(search_terms_replacement_key)); | 42 new base::StringValue(search_terms_replacement_key)); |
43 | 43 |
44 std::vector<std::string> encodings_items; | |
45 base::SplitString(encodings, ';', &encodings_items); | |
46 scoped_ptr<base::ListValue> encodings_list(new base::ListValue); | 44 scoped_ptr<base::ListValue> encodings_list(new base::ListValue); |
47 for (std::vector<std::string>::const_iterator it = encodings_items.begin(); | 45 for (const std::string& term : base::SplitString( |
48 it != encodings_items.end(); | 46 encodings, ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) |
49 ++it) { | 47 encodings_list->AppendString(term); |
50 encodings_list->AppendString(*it); | |
51 } | |
52 value->Set(DefaultSearchManager::kInputEncodings, encodings_list.release()); | 48 value->Set(DefaultSearchManager::kInputEncodings, encodings_list.release()); |
53 | 49 |
54 scoped_ptr<base::ListValue> alternate_url_list(new base::ListValue()); | 50 scoped_ptr<base::ListValue> alternate_url_list(new base::ListValue()); |
55 if (!alternate_url.empty()) | 51 if (!alternate_url.empty()) |
56 alternate_url_list->Append(new base::StringValue(alternate_url)); | 52 alternate_url_list->Append(new base::StringValue(alternate_url)); |
57 value->Set(DefaultSearchManager::kAlternateURLs, | 53 value->Set(DefaultSearchManager::kAlternateURLs, |
58 alternate_url_list.release()); | 54 alternate_url_list.release()); |
59 return value.Pass(); | 55 return value.Pass(); |
60 } | 56 } |
OLD | NEW |