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

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

Issue 2767893002: Remove ScopedVector from chrome/browser/. (Closed)
Patch Set: Address comments from zea@ Created 3 years, 9 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"
13 #include "base/run_loop.h" 12 #include "base/run_loop.h"
14 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
15 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
16 #include "base/time/time.h" 15 #include "base/time/time.h"
17 #include "chrome/browser/search_engines/template_url_service_test_util.h" 16 #include "chrome/browser/search_engines/template_url_service_test_util.h"
18 #include "chrome/test/base/testing_profile.h" 17 #include "chrome/test/base/testing_profile.h"
19 #include "components/search_engines/search_engines_pref_names.h" 18 #include "components/search_engines/search_engines_pref_names.h"
20 #include "components/search_engines/search_engines_test_util.h" 19 #include "components/search_engines/search_engines_test_util.h"
21 #include "components/search_engines/search_terms_data.h" 20 #include "components/search_engines/search_terms_data.h"
22 #include "components/search_engines/template_url.h" 21 #include "components/search_engines/template_url.h"
(...skipping 2459 matching lines...) Expand 10 before | Expand all | Expand 10 after
2482 2481
2483 TEST_F(TemplateURLServiceSyncTest, NonAsciiKeywordDoesNotCrash) { 2482 TEST_F(TemplateURLServiceSyncTest, NonAsciiKeywordDoesNotCrash) {
2484 model()->Add(CreateTestTemplateURL(UTF8ToUTF16("\xf0\xaf\xa6\x8d"), 2483 model()->Add(CreateTestTemplateURL(UTF8ToUTF16("\xf0\xaf\xa6\x8d"),
2485 "http://key1.com")); 2484 "http://key1.com"));
2486 syncer::SyncDataList initial_data = CreateInitialSyncData(); 2485 syncer::SyncDataList initial_data = CreateInitialSyncData();
2487 2486
2488 model()->MergeDataAndStartSyncing( 2487 model()->MergeDataAndStartSyncing(
2489 syncer::SEARCH_ENGINES, initial_data, PassProcessor(), 2488 syncer::SEARCH_ENGINES, initial_data, PassProcessor(),
2490 CreateAndPassSyncErrorFactory()); 2489 CreateAndPassSyncErrorFactory());
2491 } 2490 }
OLDNEW
« no previous file with comments | « chrome/browser/safe_search_api/safe_search_url_checker.cc ('k') | chrome/browser/sessions/session_restore.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698