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

Side by Side Diff: chrome/browser/search_engines/template_url_service_sync_unittest.cc

Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc-1
Patch Set: Rebase. Created 4 years, 5 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 (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"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.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 "chrome/browser/search_engines/template_url_service_test_util.h" 17 #include "chrome/browser/search_engines/template_url_service_test_util.h"
18 #include "chrome/test/base/testing_profile.h" 18 #include "chrome/test/base/testing_profile.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/search_terms_data.h" 20 #include "components/search_engines/search_terms_data.h"
21 #include "components/search_engines/template_url.h" 21 #include "components/search_engines/template_url.h"
22 #include "components/search_engines/template_url_prepopulate_data.h" 22 #include "components/search_engines/template_url_prepopulate_data.h"
23 #include "components/search_engines/template_url_service.h" 23 #include "components/search_engines/template_url_service.h"
24 #include "components/search_engines/template_url_service_client.h" 24 #include "components/search_engines/template_url_service_client.h"
25 #include "components/sync/api/sync_change_processor_wrapper_for_test.h"
26 #include "components/sync/api/sync_error_factory.h"
27 #include "components/sync/api/sync_error_factory_mock.h"
28 #include "components/sync/protocol/search_engine_specifics.pb.h"
29 #include "components/sync/protocol/sync.pb.h"
25 #include "components/syncable_prefs/testing_pref_service_syncable.h" 30 #include "components/syncable_prefs/testing_pref_service_syncable.h"
26 #include "components/url_formatter/url_formatter.h" 31 #include "components/url_formatter/url_formatter.h"
27 #include "content/public/test/test_browser_thread_bundle.h" 32 #include "content/public/test/test_browser_thread_bundle.h"
28 #include "sync/api/sync_change_processor_wrapper_for_test.h"
29 #include "sync/api/sync_error_factory.h"
30 #include "sync/api/sync_error_factory_mock.h"
31 #include "sync/protocol/search_engine_specifics.pb.h"
32 #include "sync/protocol/sync.pb.h"
33 #include "testing/gtest/include/gtest/gtest.h" 33 #include "testing/gtest/include/gtest/gtest.h"
34 34
35 using base::ASCIIToUTF16; 35 using base::ASCIIToUTF16;
36 using base::UTF8ToUTF16; 36 using base::UTF8ToUTF16;
37 using base::Time; 37 using base::Time;
38 38
39 namespace { 39 namespace {
40 40
41 const char kOmniboxScheme[] = "omnibox"; 41 const char kOmniboxScheme[] = "omnibox";
42 42
(...skipping 2302 matching lines...) Expand 10 before | Expand all | Expand 10 after
2345 2345
2346 TEST_F(TemplateURLServiceSyncTest, NonAsciiKeywordDoesNotCrash) { 2346 TEST_F(TemplateURLServiceSyncTest, NonAsciiKeywordDoesNotCrash) {
2347 model()->Add(CreateTestTemplateURL(UTF8ToUTF16("\xf0\xaf\xa6\x8d"), 2347 model()->Add(CreateTestTemplateURL(UTF8ToUTF16("\xf0\xaf\xa6\x8d"),
2348 "http://key1.com")); 2348 "http://key1.com"));
2349 syncer::SyncDataList initial_data = CreateInitialSyncData(); 2349 syncer::SyncDataList initial_data = CreateInitialSyncData();
2350 2350
2351 model()->MergeDataAndStartSyncing( 2351 model()->MergeDataAndStartSyncing(
2352 syncer::SEARCH_ENGINES, initial_data, PassProcessor(), 2352 syncer::SEARCH_ENGINES, initial_data, PassProcessor(),
2353 CreateAndPassSyncErrorFactory()); 2353 CreateAndPassSyncErrorFactory());
2354 } 2354 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698