OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/file_util.h" | 5 #include "base/file_util.h" |
6 #include "base/memory/scoped_vector.h" | 6 #include "base/memory/scoped_vector.h" |
7 #include "base/scoped_temp_dir.h" | 7 #include "base/scoped_temp_dir.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/search_engines/search_engine_type.h" | 9 #include "chrome/browser/search_engines/search_engine_type.h" |
10 #include "chrome/browser/search_engines/search_terms_data.h" | 10 #include "chrome/browser/search_engines/search_terms_data.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 } | 89 } |
90 } | 90 } |
91 } | 91 } |
92 | 92 |
93 // Verifies that default search providers from the preferences file | 93 // Verifies that default search providers from the preferences file |
94 // override the built-in ones. | 94 // override the built-in ones. |
95 TEST_F(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) { | 95 TEST_F(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) { |
96 TestingPrefService prefs; | 96 TestingPrefService prefs; |
97 TemplateURLPrepopulateData::RegisterUserPrefs(&prefs); | 97 TemplateURLPrepopulateData::RegisterUserPrefs(&prefs); |
98 prefs.SetUserPref(prefs::kSearchProviderOverridesVersion, | 98 prefs.SetUserPref(prefs::kSearchProviderOverridesVersion, |
99 Value::CreateIntegerValue(1)); | 99 base::NumberValue::New(1)); |
100 ListValue* overrides = new ListValue; | 100 ListValue* overrides = new ListValue; |
101 DictionaryValue* entry = new DictionaryValue; | 101 DictionaryValue* entry = new DictionaryValue; |
102 entry->SetString("name", "foo"); | 102 entry->SetString("name", "foo"); |
103 entry->SetString("keyword", "fook"); | 103 entry->SetString("keyword", "fook"); |
104 entry->SetString("search_url", "http://foo.com/s?q={searchTerms}"); | 104 entry->SetString("search_url", "http://foo.com/s?q={searchTerms}"); |
105 entry->SetString("favicon_url", "http://foi.com/favicon.ico"); | 105 entry->SetString("favicon_url", "http://foi.com/favicon.ico"); |
106 entry->SetString("suggest_url", ""); | 106 entry->SetString("suggest_url", ""); |
107 entry->SetString("instant_url", ""); | 107 entry->SetString("instant_url", ""); |
108 entry->SetString("encoding", "UTF-8"); | 108 entry->SetString("encoding", "UTF-8"); |
109 entry->SetInteger("search_engine_type", 1); | 109 entry->SetInteger("search_engine_type", 1); |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 EXPECT_EQ(kNoSearchEngineLogo, | 179 EXPECT_EQ(kNoSearchEngineLogo, |
180 TemplateURLPrepopulateData::GetSearchEngineLogo(bad_engine)); | 180 TemplateURLPrepopulateData::GetSearchEngineLogo(bad_engine)); |
181 GURL engine_with_logo("http://www.ask.com/"); | 181 GURL engine_with_logo("http://www.ask.com/"); |
182 EXPECT_EQ(IDR_SEARCH_ENGINE_LOGO_ASK, | 182 EXPECT_EQ(IDR_SEARCH_ENGINE_LOGO_ASK, |
183 TemplateURLPrepopulateData::GetSearchEngineLogo(engine_with_logo)); | 183 TemplateURLPrepopulateData::GetSearchEngineLogo(engine_with_logo)); |
184 GURL engine_no_logo("http://araby.com/"); | 184 GURL engine_no_logo("http://araby.com/"); |
185 EXPECT_EQ(kNoSearchEngineLogo, | 185 EXPECT_EQ(kNoSearchEngineLogo, |
186 TemplateURLPrepopulateData::GetSearchEngineLogo(engine_no_logo)); | 186 TemplateURLPrepopulateData::GetSearchEngineLogo(engine_no_logo)); |
187 | 187 |
188 } | 188 } |
OLD | NEW |