components/search_engines/template_url_service_sync_unittest.cc - Issue 1548203002: Convert Pass()→std::move() in //components/[n-z]*

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 1548203002: Convert Pass()→std::move() in //components/[n-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix bad headers Created 5 years 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/search_engines/template_url_service.cc ('k') | components/search_engines/template_url_service_unittest.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 68f373701d92fb03eca6a0794ecffb6cb3a2f3cb..e6981d753c5101ba09b9d470403f0524648d706e 100644

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

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

@@ -3,6 +3,7 @@

// found in the LICENSE file.

#include <stddef.h>

+#include <utility>

#include "base/macros.h"

#include "base/memory/scoped_ptr.h"

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

scoped_ptr<syncer::SyncChangeProcessor>

TemplateURLServiceSyncTest::PassProcessor() {

- return sync_processor_wrapper_.Pass();

+ return std::move(sync_processor_wrapper_);

}

scoped_ptr<syncer::SyncErrorFactory> TemplateURLServiceSyncTest::

@@ -1319,10 +1320,8 @@ TEST_F(TemplateURLServiceSyncTest, MergeTwoClientsBasic) {

scoped_ptr<syncer::SyncChangeProcessorWrapperForTest> delegate_b(

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

model_a()->MergeDataAndStartSyncing(

- syncer::SEARCH_ENGINES,

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

- delegate_b.Pass(),

- CreateAndPassSyncErrorFactory());

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

+ std::move(delegate_b), CreateAndPassSyncErrorFactory());

// They should be consistent.

AssertEquals(model_a()->GetAllSyncData(syncer::SEARCH_ENGINES),

@@ -1349,10 +1348,8 @@ TEST_F(TemplateURLServiceSyncTest, MergeTwoClientsDupesAndConflicts) {