| Index: chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h b/chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h
|
| index 4590a4bcb998a210c3badec9c98492c1c5fa2dc1..da1405a7fc67ec75d590d01a8cd235a09e5d14ca 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h
|
| +++ b/chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_INTERFACE_H_
|
| #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_INTERFACE_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/sync_file_system/remote_file_sync_service.h"
|
| #include "chrome/browser/sync_file_system/sync_action.h"
|
| #include "chrome/browser/sync_file_system/sync_callbacks.h"
|
| @@ -65,7 +65,7 @@ class SyncWorkerInterface {
|
|
|
| // Initializes SyncWorkerInterface after constructions of some member classes.
|
| virtual void Initialize(
|
| - scoped_ptr<SyncEngineContext> sync_engine_context) = 0;
|
| + std::unique_ptr<SyncEngineContext> sync_engine_context) = 0;
|
|
|
| // See RemoteFileSyncService for the details.
|
| virtual void RegisterOrigin(const GURL& origin,
|
| @@ -84,8 +84,8 @@ class SyncWorkerInterface {
|
| virtual RemoteServiceState GetCurrentState() const = 0;
|
| virtual void GetOriginStatusMap(
|
| const RemoteFileSyncService::StatusMapCallback& callback) = 0;
|
| - virtual scoped_ptr<base::ListValue> DumpFiles(const GURL& origin) = 0;
|
| - virtual scoped_ptr<base::ListValue> DumpDatabase() = 0;
|
| + virtual std::unique_ptr<base::ListValue> DumpFiles(const GURL& origin) = 0;
|
| + virtual std::unique_ptr<base::ListValue> DumpDatabase() = 0;
|
| virtual void SetSyncEnabled(bool enabled) = 0;
|
| virtual void PromoteDemotedChanges(const base::Closure& callback) = 0;
|
|
|
|
|