| Index: chrome/browser/sync_file_system/remote_file_sync_service.h
|
| diff --git a/chrome/browser/sync_file_system/remote_file_sync_service.h b/chrome/browser/sync_file_system/remote_file_sync_service.h
|
| index 042d52413478d147322e09585d6e46e3bce00cac..bdde16e929dd9855a293a9fae8c61d03bbf66de7 100644
|
| --- a/chrome/browser/sync_file_system/remote_file_sync_service.h
|
| +++ b/chrome/browser/sync_file_system/remote_file_sync_service.h
|
| @@ -8,12 +8,12 @@
|
| #include <stdint.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <set>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/sync_file_system/conflict_resolution_policy.h"
|
| #include "chrome/browser/sync_file_system/sync_callbacks.h"
|
| #include "chrome/browser/sync_file_system/sync_file_metadata.h"
|
| @@ -117,7 +117,7 @@ class RemoteFileSyncService {
|
|
|
| // For GetOriginStatusMap.
|
| typedef std::map<GURL, std::string> OriginStatusMap;
|
| - typedef base::Callback<void(scoped_ptr<OriginStatusMap> status_map)>
|
| + typedef base::Callback<void(std::unique_ptr<OriginStatusMap> status_map)>
|
| StatusMapCallback;
|
|
|
| // For GetRemoteVersions.
|
| @@ -129,11 +129,12 @@ class RemoteFileSyncService {
|
| DownloadVersionCallback;
|
|
|
| // For DumpFile.
|
| - typedef base::Callback<void(scoped_ptr<base::ListValue> list)> ListCallback;
|
| + typedef base::Callback<void(std::unique_ptr<base::ListValue> list)>
|
| + ListCallback;
|
|
|
| // Creates an initialized RemoteFileSyncService for backend |version|
|
| // for |context|.
|
| - static scoped_ptr<RemoteFileSyncService> CreateForBrowserContext(
|
| + static std::unique_ptr<RemoteFileSyncService> CreateForBrowserContext(
|
| content::BrowserContext* context,
|
| TaskLogger* task_logger);
|
|
|
|
|