components/sync_driver/non_blocking_data_type_controller.cc - Issue 1907683003: Convert //components/sync_driver from scoped_ptr to std::unique_ptr

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/sync_driver/non_blocking_data_type_controller.cc

Issue 1907683003: Convert //components/sync_driver from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Build fix, address feedback Created 4 years, 8 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/sync_driver/non_blocking_data_type_controller.h ('k') | components/sync_driver/non_ui_data_type_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync_driver/non_blocking_data_type_controller.cc

diff --git a/components/sync_driver/non_blocking_data_type_controller.cc b/components/sync_driver/non_blocking_data_type_controller.cc

index 02c5fe70a55834425ea65a3d3ad4991093774a31..64e17b2f2d1913ab86d1828a1105aa0047fe2d5e 100644

--- a/components/sync_driver/non_blocking_data_type_controller.cc

+++ b/components/sync_driver/non_blocking_data_type_controller.cc

@@ -111,7 +111,7 @@ void NonBlockingDataTypeController::LoadModelsDone(

void NonBlockingDataTypeController::OnProcessorStarted(

syncer::SyncError error,

- scoped_ptr<syncer_v2::ActivationContext> activation_context) {

+ std::unique_ptr<syncer_v2::ActivationContext> activation_context) {

RunOnUIThread(

FROM_HERE,

base::Bind(&NonBlockingDataTypeController::OnProcessorStartedOnUIThread,

@@ -120,7 +120,7 @@ void NonBlockingDataTypeController::OnProcessorStarted(

void NonBlockingDataTypeController::OnProcessorStartedOnUIThread(

syncer::SyncError error,

- scoped_ptr<syncer_v2::ActivationContext> activation_context) {

+ std::unique_ptr<syncer_v2::ActivationContext> activation_context) {

DCHECK(BelongsToUIThread());

// Hold on to the activation context until ActivateDataType is called.

if (state_ == MODEL_STARTING) {