diff options
| author | bnc <bnc@chromium.org> | 2015-03-09 16:12:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-09 23:14:13 +0000 |
| commit | cd8db1dfaf165cbca88f38ecf50a5cacc09959b1 (patch) | |
| tree | 7915be516bf8ddc3d7da0156749f3536e32aa00a /sync/api/fake_syncable_service.h | |
| parent | 982eb90bf74535cbe5e21c4eacb759c42ff424d4 (diff) | |
| download | chromium_src-cd8db1dfaf165cbca88f38ecf50a5cacc09959b1.zip chromium_src-cd8db1dfaf165cbca88f38ecf50a5cacc09959b1.tar.gz chromium_src-cd8db1dfaf165cbca88f38ecf50a5cacc09959b1.tar.bz2 | |
Revert of [Sync] Refactor AttachmentStore classes. Introduce concept of referrer. (patchset #2 id:20001 of https://codereview.chromium.org/986743004/)
Reason for revert:
I think this CL is responsible for tree closing compile failure https://build.chromium.org/p/chromium.mac/builders/iOS_Device/builds/26672/steps/compile/logs/stdio.
Original issue's description:
> [Sync] Refactor AttachmentStore classes. Introduce concept of referrer.
>
> In this change:
> - Move towards following class hierarchy: http://www.plantuml.com:80/plantuml/png/ZPBTJiCm38NlynIvv4TzWsaI525nCI5jkw-on1EZQHmvwQG9U7TC4-ZeKiITvNm-EiSExbv1Hxc6VOszYs24mDHQeG6xFNcGRqBAknYLVkd0nKr40l7nmqrU1deDeRUHYrfPkrEw3LmJx848YCkWqODfkECZBIOAZuHin9abWxUo9b0Hdjt38RGJyEhwZ4YZI9kJq_mmRp0pAPKnd7pGgG8t6usTHyVe7_FPtY3mbOth9ghGDjGxTnwlaEq-ySjv-KmCwZflxvVyE5bSIa4Mw7ZGyDHvAyHurPkgkhZgz9PuoNp75tDhAUZcJ68cwkATHyfXnFWn4_PFDsKuNLuKLrFodGS-0G00
> - Remove AttachmenService::GetStore. Now attachment store is owned by
> model type, there is no need to get it from AttachmentService
> - Introduce AttachmentReferrer. There is no functionality behind it yet
> and interface is not complete for it. These will come in the next change.
>
> BUG=457735
> R=maniscalco@chromium.org
> TEST=Not exposed in chrome. Only unit tests available (sync_unit_tests)
>
> Committed: https://crrev.com/6adcada8a799057c31c0f17550c9e2747a8df847
> Cr-Commit-Position: refs/heads/master@{#319733}
TBR=maniscalco@chromium.org,cjhopman@chromium.org,pavely@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=457735
Review URL: https://codereview.chromium.org/996473005
Cr-Commit-Position: refs/heads/master@{#319760}
Diffstat (limited to 'sync/api/fake_syncable_service.h')
| -rw-r--r-- | sync/api/fake_syncable_service.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sync/api/fake_syncable_service.h b/sync/api/fake_syncable_service.h index 9b75647..7403ef3 100644 --- a/sync/api/fake_syncable_service.h +++ b/sync/api/fake_syncable_service.h @@ -23,7 +23,8 @@ class FakeSyncableService : public SyncableService { void set_process_sync_changes_error(const SyncError& error); // Setter for AttachmentStore. - void set_attachment_store(scoped_ptr<AttachmentStore> attachment_store); + void set_attachment_store( + const scoped_refptr<AttachmentStore>& attachment_store); // AttachmentService should be set when this syncable service is connected, // just before MergeDataAndStartSyncing. NULL is returned by default. @@ -43,7 +44,7 @@ class FakeSyncableService : public SyncableService { SyncDataList GetAllSyncData(ModelType type) const override; SyncError ProcessSyncChanges(const tracked_objects::Location& from_here, const SyncChangeList& change_list) override; - scoped_ptr<AttachmentStore> GetAttachmentStoreForSync() override; + scoped_refptr<AttachmentStore> GetAttachmentStore() override; void SetAttachmentService( scoped_ptr<AttachmentService> attachment_service) override; @@ -53,7 +54,7 @@ class FakeSyncableService : public SyncableService { SyncError process_sync_changes_error_; bool syncing_; ModelType type_; - scoped_ptr<AttachmentStore> attachment_store_; + scoped_refptr<AttachmentStore> attachment_store_; scoped_ptr<AttachmentService> attachment_service_; }; |