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

Unified Diff: components/sync_driver/ui_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
« no previous file with comments | « components/sync_driver/sync_stopped_reporter.h ('k') | components/sync_driver/ui_data_type_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync_driver/ui_data_type_controller.h
diff --git a/components/sync_driver/ui_data_type_controller.h b/components/sync_driver/ui_data_type_controller.h
index a7fbfb618006f52b73b251a1a0ed39a2eca9522f..130b851ad7c1a6815e7dacdbb454ab3f1a72e74e 100644
--- a/components/sync_driver/ui_data_type_controller.h
+++ b/components/sync_driver/ui_data_type_controller.h
@@ -5,12 +5,12 @@
#ifndef COMPONENTS_SYNC_DRIVER_UI_DATA_TYPE_CONTROLLER_H_
#define COMPONENTS_SYNC_DRIVER_UI_DATA_TYPE_CONTROLLER_H_
+#include <memory>
#include <string>
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "components/sync_driver/directory_data_type_controller.h"
#include "components/sync_driver/shared_change_processor.h"
@@ -56,7 +56,7 @@ class UIDataTypeController : public DirectoryDataTypeController {
// Used by tests to override the factory used to create
// GenericChangeProcessors.
void SetGenericChangeProcessorFactoryForTest(
- scoped_ptr<GenericChangeProcessorFactory> factory);
+ std::unique_ptr<GenericChangeProcessorFactory> factory);
protected:
// For testing only.
@@ -118,7 +118,7 @@ class UIDataTypeController : public DirectoryDataTypeController {
// datatypes).
scoped_refptr<SharedChangeProcessor> shared_change_processor_;
- scoped_ptr<GenericChangeProcessorFactory> processor_factory_;
+ std::unique_ptr<GenericChangeProcessorFactory> processor_factory_;
// A weak pointer to the actual local syncable service, which performs all the
// real work. We do not own the object.
« no previous file with comments | « components/sync_driver/sync_stopped_reporter.h ('k') | components/sync_driver/ui_data_type_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698