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

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: 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
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.
« no previous file with comments | « components/sync_driver/fake_sync_service.cc ('k') | components/sync_driver/frontend_data_type_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698