components/search_engines/template_url_service_sync_unittest.cc - Issue 655143002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/search_engines/template_url_service_sync_unittest.cc

Issue 655143002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/proximity_auth/bluetooth_connection_unittest.cc ('k') | components/sync_driver/fake_generic_change_processor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/search_engines/template_url_service_sync_unittest.cc

diff --git a/components/search_engines/template_url_service_sync_unittest.cc b/components/search_engines/template_url_service_sync_unittest.cc

index 0b3f8827e5aa29dd664b8905599cdcae8c8f064d..a6323db2e913ce1d175bebd24c580e7979dbc662 100644

--- a/components/search_engines/template_url_service_sync_unittest.cc

+++ b/components/search_engines/template_url_service_sync_unittest.cc

@@ -245,7 +245,7 @@ void TemplateURLServiceSyncTest::TearDown() {

scoped_ptr<syncer::SyncChangeProcessor>

TemplateURLServiceSyncTest::PassProcessor() {

- return sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>();

+ return sync_processor_wrapper_.Pass();

}

scoped_ptr<syncer::SyncErrorFactory> TemplateURLServiceSyncTest::

@@ -1286,9 +1286,10 @@ TEST_F(TemplateURLServiceSyncTest, MergeTwoClientsBasic) {

// has no data.

scoped_ptr<syncer::SyncChangeProcessorWrapperForTest> delegate_b(

new syncer::SyncChangeProcessorWrapperForTest(model_b()));

- model_a()->MergeDataAndStartSyncing(syncer::SEARCH_ENGINES,

+ model_a()->MergeDataAndStartSyncing(

+ syncer::SEARCH_ENGINES,

model_b()->GetAllSyncData(syncer::SEARCH_ENGINES),

- delegate_b.PassAs<syncer::SyncChangeProcessor>(),

+ delegate_b.Pass(),

CreateAndPassSyncErrorFactory());

// They should be consistent.

@@ -1315,9 +1316,10 @@ TEST_F(TemplateURLServiceSyncTest, MergeTwoClientsDupesAndConflicts) {

// Merge A and B.