| Index: chrome/browser/sync_file_system/sync_file_system_test_util.cc
|
| diff --git a/chrome/browser/sync_file_system/sync_file_system_test_util.cc b/chrome/browser/sync_file_system/sync_file_system_test_util.cc
|
| index 2e5a0e4ea99e4b3014327c729166b1de07cd9b57..37856f671f15360b757bcf14db478eab0750f36a 100644
|
| --- a/chrome/browser/sync_file_system/sync_file_system_test_util.cc
|
| +++ b/chrome/browser/sync_file_system/sync_file_system_test_util.cc
|
| @@ -4,9 +4,9 @@
|
|
|
| #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
|
|
|
| +#include <memory>
|
| #include <utility>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/run_loop.h"
|
| #include "chrome/browser/sync_file_system/remote_file_sync_service.h"
|
| #include "chrome/browser/sync_file_system/sync_status_code.h"
|
| @@ -57,7 +57,7 @@ AssignAndQuitCallback(base::RunLoop*, SyncStatusCode*);
|
| template base::Callback<void(type)> CreateResultReceiver(type*);
|
| INSTANTIATE_RECEIVER(SyncStatusCode);
|
| INSTANTIATE_RECEIVER(google_apis::DriveApiErrorCode);
|
| -INSTANTIATE_RECEIVER(scoped_ptr<RemoteFileSyncService::OriginStatusMap>);
|
| +INSTANTIATE_RECEIVER(std::unique_ptr<RemoteFileSyncService::OriginStatusMap>);
|
| #undef INSTANTIATE_RECEIVER
|
|
|
| } // namespace sync_file_system
|
|
|