OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 | 158 |
159 void Shutdown() override {} | 159 void Shutdown() override {} |
160 void SetOwner(TemplateURLService* owner) override {} | 160 void SetOwner(TemplateURLService* owner) override {} |
161 void DeleteAllSearchTermsForKeyword(TemplateURLID id) override {} | 161 void DeleteAllSearchTermsForKeyword(TemplateURLID id) override {} |
162 void SetKeywordSearchTermsForURL( | 162 void SetKeywordSearchTermsForURL( |
163 const GURL& url, | 163 const GURL& url, |
164 TemplateURLID id, | 164 TemplateURLID id, |
165 const base::string16& term) override {} | 165 const base::string16& term) override {} |
166 void AddKeywordGeneratedVisit(const GURL& url) override {} | 166 void AddKeywordGeneratedVisit(const GURL& url) override {} |
167 bool IsOmniboxExtensionURL(const std::string& url) override { return false; } | 167 bool IsOmniboxExtensionURL(const std::string& url) override { return false; } |
| 168 void SetExtensionControlledPref( |
| 169 const std::string extension_id, const std::string pref_name, |
| 170 std::unique_ptr<base::Value> pref_value) override {} |
168 }; | 171 }; |
169 | 172 |
170 } // namespace | 173 } // namespace |
171 | 174 |
172 | 175 |
173 // TemplateURLServiceSyncTest ------------------------------------------------- | 176 // TemplateURLServiceSyncTest ------------------------------------------------- |
174 | 177 |
175 class TemplateURLServiceSyncTest : public testing::Test { | 178 class TemplateURLServiceSyncTest : public testing::Test { |
176 public: | 179 public: |
177 typedef TemplateURLService::SyncDataMap SyncDataMap; | 180 typedef TemplateURLService::SyncDataMap SyncDataMap; |
(...skipping 2139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2317 | 2320 |
2318 TEST_F(TemplateURLServiceSyncTest, NonAsciiKeywordDoesNotCrash) { | 2321 TEST_F(TemplateURLServiceSyncTest, NonAsciiKeywordDoesNotCrash) { |
2319 model()->Add(CreateTestTemplateURL(UTF8ToUTF16("\xf0\xaf\xa6\x8d"), | 2322 model()->Add(CreateTestTemplateURL(UTF8ToUTF16("\xf0\xaf\xa6\x8d"), |
2320 "http://key1.com")); | 2323 "http://key1.com")); |
2321 syncer::SyncDataList initial_data = CreateInitialSyncData(); | 2324 syncer::SyncDataList initial_data = CreateInitialSyncData(); |
2322 | 2325 |
2323 model()->MergeDataAndStartSyncing( | 2326 model()->MergeDataAndStartSyncing( |
2324 syncer::SEARCH_ENGINES, initial_data, PassProcessor(), | 2327 syncer::SEARCH_ENGINES, initial_data, PassProcessor(), |
2325 CreateAndPassSyncErrorFactory()); | 2328 CreateAndPassSyncErrorFactory()); |
2326 } | 2329 } |
OLD | NEW |