Index: components/sync/syncable/syncable_unittest.cc |
diff --git a/components/sync/syncable/syncable_unittest.cc b/components/sync/syncable/syncable_unittest.cc |
index c2df5240d9df3e512c31fa48ca4951314ec38114..9ffb772e876e4d14cc166e585737d1f93b6c3003 100644 |
--- a/components/sync/syncable/syncable_unittest.cc |
+++ b/components/sync/syncable/syncable_unittest.cc |
@@ -13,6 +13,7 @@ |
#include "base/files/scoped_temp_dir.h" |
#include "base/location.h" |
#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "base/message_loop/message_loop.h" |
#include "base/stl_util.h" |
#include "base/synchronization/condition_variable.h" |
@@ -342,10 +343,10 @@ TEST_F(OnDiskSyncableDirectoryTest, |
} |
dir()->SaveChanges(); |
- dir().reset( |
- new Directory(new OnDiskDirectoryBackingStore(kDirectoryName, file_path_), |
- MakeWeakHandle(unrecoverable_error_handler()->GetWeakPtr()), |
- base::Closure(), NULL, NULL)); |
+ dir() = base::MakeUnique<Directory>( |
+ new OnDiskDirectoryBackingStore(kDirectoryName, file_path_), |
+ MakeWeakHandle(unrecoverable_error_handler()->GetWeakPtr()), |
+ base::Closure(), nullptr, nullptr); |
ASSERT_TRUE(dir().get()); |
ASSERT_EQ(OPENED, dir()->Open(kDirectoryName, directory_change_delegate(), |