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

Unified Diff: components/sync_driver/ui_data_type_controller_unittest.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
Index: components/sync_driver/ui_data_type_controller_unittest.cc
diff --git a/components/sync_driver/ui_data_type_controller_unittest.cc b/components/sync_driver/ui_data_type_controller_unittest.cc
index 577847fa03da451955096e13a0b9948c97599005..6aafc6082c7ded2747f5dbf01582afe58cdf3dec 100644
--- a/components/sync_driver/ui_data_type_controller_unittest.cc
+++ b/components/sync_driver/ui_data_type_controller_unittest.cc
@@ -4,11 +4,11 @@
#include "components/sync_driver/ui_data_type_controller.h"
+#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/location.h"
-#include "base/memory/scoped_ptr.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "base/tracked_objects.h"
@@ -60,10 +60,10 @@ class SyncUIDataTypeControllerTest : public testing::Test,
protected:
void SetStartExpectations() {
- scoped_ptr<FakeGenericChangeProcessor> p(
+ std::unique_ptr<FakeGenericChangeProcessor> p(
new FakeGenericChangeProcessor(type_, this));
change_processor_ = p.get();
- scoped_ptr<GenericChangeProcessorFactory> f(
+ std::unique_ptr<GenericChangeProcessorFactory> f(
new FakeGenericChangeProcessorFactory(std::move(p)));
preference_dtc_->SetGenericChangeProcessorFactoryForTest(std::move(f));
EXPECT_CALL(model_load_callback_, Run(_, _));
« no previous file with comments | « components/sync_driver/ui_data_type_controller.cc ('k') | components/sync_driver/ui_model_type_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698