Index: sync/test/engine/test_directory_setter_upper.h |
diff --git a/sync/test/engine/test_directory_setter_upper.h b/sync/test/engine/test_directory_setter_upper.h |
index 72b4ee9eafa01f7045b94826f3f854081312c267..cd9674719212464854d9832191669b920cd9a0ee 100644 |
--- a/sync/test/engine/test_directory_setter_upper.h |
+++ b/sync/test/engine/test_directory_setter_upper.h |
@@ -29,11 +29,11 @@ |
#ifndef SYNC_TEST_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_ |
#define SYNC_TEST_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_ |
+#include <memory> |
#include <string> |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "sync/test/fake_sync_encryption_handler.h" |
#include "sync/test/null_directory_change_delegate.h" |
#include "sync/util/test_unrecoverable_error_handler.h" |
@@ -75,13 +75,13 @@ class TestDirectorySetterUpper { |
private: |
syncable::NullDirectoryChangeDelegate delegate_; |
- scoped_ptr<syncable::TestTransactionObserver> test_transaction_observer_; |
+ std::unique_ptr<syncable::TestTransactionObserver> test_transaction_observer_; |
TestUnrecoverableErrorHandler handler_; |
void RunInvariantCheck(); |
FakeSyncEncryptionHandler encryption_handler_; |
- scoped_ptr<syncable::Directory> directory_; |
+ std::unique_ptr<syncable::Directory> directory_; |
std::string name_; |
DISALLOW_COPY_AND_ASSIGN(TestDirectorySetterUpper); |