components/sync_driver/frontend_data_type_controller.h - 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/frontend_data_type_controller.h

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: 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

« components/sync_driver/fake_sync_client.h ('K') | « components/sync_driver/fake_sync_service.cc ('k') | components/sync_driver/frontend_data_type_controller_unittest.cc » ('j') | components/sync_driver/glue/browser_thread_model_worker_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync_driver/frontend_data_type_controller.h

diff --git a/components/sync_driver/frontend_data_type_controller.h b/components/sync_driver/frontend_data_type_controller.h

index 27776f08ebbd97b1b4a0197249b74e9416df3ad1..cd3bbf80d0221d3193f644a2cc6d386ea9c2bbc6 100644

--- a/components/sync_driver/frontend_data_type_controller.h

+++ b/components/sync_driver/frontend_data_type_controller.h

@@ -5,11 +5,11 @@

#ifndef COMPONENTS_SYNC_DRIVER_FRONTEND_DATA_TYPE_CONTROLLER_H__

#define COMPONENTS_SYNC_DRIVER_FRONTEND_DATA_TYPE_CONTROLLER_H__

+#include <memory>

#include <string>

#include "base/compiler_specific.h"

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/threading/thread_checker.h"

#include "components/sync_driver/data_type_error_handler.h"

#include "components/sync_driver/directory_data_type_controller.h"

@@ -122,8 +122,8 @@ class FrontendDataTypeController

// TODO(sync): transition all datatypes to SyncableService and deprecate

// AssociatorInterface.

- scoped_ptr<sync_driver::AssociatorInterface> model_associator_;

- scoped_ptr<sync_driver::ChangeProcessor> change_processor_;

+ std::unique_ptr<sync_driver::AssociatorInterface> model_associator_;

+ std::unique_ptr<sync_driver::ChangeProcessor> change_processor_;

private:

// Build sync components and associate models.