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

Side by Side Diff: components/browser_sync/browser/profile_sync_service_autofill_unittest.cc

Issue 2256813005: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 ProfileSyncServiceAutofillTest() : debug_ptr_factory_(this) { 405 ProfileSyncServiceAutofillTest() : debug_ptr_factory_(this) {
406 autofill::CountryNames::SetLocaleString("en-US"); 406 autofill::CountryNames::SetLocaleString("en-US");
407 RegisterAutofillPrefs( 407 RegisterAutofillPrefs(
408 profile_sync_service_bundle()->pref_service()->registry()); 408 profile_sync_service_bundle()->pref_service()->registry());
409 409
410 data_type_thread()->Start(); 410 data_type_thread()->Start();
411 profile_sync_service_bundle()->set_db_thread( 411 profile_sync_service_bundle()->set_db_thread(
412 data_type_thread()->task_runner()); 412 data_type_thread()->task_runner());
413 413
414 web_database_.reset(new WebDatabaseFake(&autofill_table_)); 414 web_database_.reset(new WebDatabaseFake(&autofill_table_));
415 web_data_wrapper_ = base::WrapUnique(new MockWebDataServiceWrapper( 415 web_data_wrapper_ = base::MakeUnique<MockWebDataServiceWrapper>(
416 new WebDataServiceFake(base::ThreadTaskRunnerHandle::Get(), 416 new WebDataServiceFake(base::ThreadTaskRunnerHandle::Get(),
417 data_type_thread()->task_runner()), 417 data_type_thread()->task_runner()),
418 new TokenWebDataServiceFake(base::ThreadTaskRunnerHandle::Get(), 418 new TokenWebDataServiceFake(base::ThreadTaskRunnerHandle::Get(),
419 data_type_thread()->task_runner()))); 419 data_type_thread()->task_runner()));
420 web_data_service_ = static_cast<WebDataServiceFake*>( 420 web_data_service_ = static_cast<WebDataServiceFake*>(
421 web_data_wrapper_->GetAutofillWebData().get()); 421 web_data_wrapper_->GetAutofillWebData().get());
422 web_data_service_->SetDatabase(web_database_.get()); 422 web_data_service_->SetDatabase(web_database_.get());
423 423
424 personal_data_manager_ = base::WrapUnique(new MockPersonalDataManager()); 424 personal_data_manager_ = base::MakeUnique<MockPersonalDataManager>();
425 425
426 EXPECT_CALL(personal_data_manager(), LoadProfiles()); 426 EXPECT_CALL(personal_data_manager(), LoadProfiles());
427 EXPECT_CALL(personal_data_manager(), LoadCreditCards()); 427 EXPECT_CALL(personal_data_manager(), LoadCreditCards());
428 428
429 personal_data_manager_->Init( 429 personal_data_manager_->Init(
430 web_data_service_, profile_sync_service_bundle()->pref_service(), 430 web_data_service_, profile_sync_service_bundle()->pref_service(),
431 profile_sync_service_bundle()->account_tracker(), 431 profile_sync_service_bundle()->account_tracker(),
432 profile_sync_service_bundle()->signin_manager(), false); 432 profile_sync_service_bundle()->signin_manager(), false);
433 433
434 web_data_service_->StartSyncableService(); 434 web_data_service_->StartSyncableService();
(...skipping 1045 matching lines...) Expand 10 before | Expand all | Expand 10 after
1480 std::vector<AutofillEntry> sync_entries; 1480 std::vector<AutofillEntry> sync_entries;
1481 std::vector<AutofillProfile> sync_profiles; 1481 std::vector<AutofillProfile> sync_profiles;
1482 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); 1482 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
1483 EXPECT_EQ(3U, sync_entries.size()); 1483 EXPECT_EQ(3U, sync_entries.size());
1484 EXPECT_EQ(0U, sync_profiles.size()); 1484 EXPECT_EQ(0U, sync_profiles.size());
1485 for (size_t i = 0; i < sync_entries.size(); i++) { 1485 for (size_t i = 0; i < sync_entries.size(); i++) {
1486 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() 1486 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name()
1487 << ", " << sync_entries[i].key().value(); 1487 << ", " << sync_entries[i].key().value();
1488 } 1488 }
1489 } 1489 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698