| Index: components/sync/core_impl/attachments/on_disk_attachment_store.cc
|
| diff --git a/sync/internal_api/attachments/on_disk_attachment_store.cc b/components/sync/core_impl/attachments/on_disk_attachment_store.cc
|
| similarity index 97%
|
| rename from sync/internal_api/attachments/on_disk_attachment_store.cc
|
| rename to components/sync/core_impl/attachments/on_disk_attachment_store.cc
|
| index 0778a7c5312a469d09c4234376a04d96b56fef3b..fbf46562988b8c5143bb6d8f9779193f0c8ecf24 100644
|
| --- a/sync/internal_api/attachments/on_disk_attachment_store.cc
|
| +++ b/components/sync/core_impl/attachments/on_disk_attachment_store.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/internal_api/public/attachments/on_disk_attachment_store.h"
|
| +#include "components/sync/core/attachments/on_disk_attachment_store.h"
|
|
|
| #include <stdint.h>
|
|
|
| @@ -15,9 +15,9 @@
|
| #include "base/location.h"
|
| #include "base/metrics/histogram.h"
|
| #include "base/sequenced_task_runner.h"
|
| -#include "sync/internal_api/attachments/proto/attachment_store.pb.h"
|
| -#include "sync/internal_api/public/attachments/attachment_util.h"
|
| -#include "sync/protocol/attachments.pb.h"
|
| +#include "components/sync/core/attachments/attachment_util.h"
|
| +#include "components/sync/core_impl/attachments/proto/attachment_store.pb.h"
|
| +#include "components/sync/protocol/attachments.pb.h"
|
| #include "third_party/leveldatabase/env_chromium.h"
|
| #include "third_party/leveldatabase/src/include/leveldb/db.h"
|
| #include "third_party/leveldatabase/src/include/leveldb/options.h"
|
| @@ -153,11 +153,9 @@ bool AttachmentHasReferenceFromComponent(
|
| OnDiskAttachmentStore::OnDiskAttachmentStore(
|
| const scoped_refptr<base::SequencedTaskRunner>& callback_task_runner,
|
| const base::FilePath& path)
|
| - : AttachmentStoreBackend(callback_task_runner), path_(path) {
|
| -}
|
| + : AttachmentStoreBackend(callback_task_runner), path_(path) {}
|
|
|
| -OnDiskAttachmentStore::~OnDiskAttachmentStore() {
|
| -}
|
| +OnDiskAttachmentStore::~OnDiskAttachmentStore() {}
|
|
|
| void OnDiskAttachmentStore::Init(
|
| const AttachmentStore::InitCallback& callback) {
|
| @@ -419,8 +417,8 @@ std::unique_ptr<Attachment> OnDiskAttachmentStore::ReadSingleAttachment(
|
|
|
| const std::string key = MakeDataKeyFromAttachmentId(attachment_id);
|
| std::string data_str;
|
| - leveldb::Status status = db_->Get(
|
| - MakeNonCachingReadOptions(), key, &data_str);
|
| + leveldb::Status status =
|
| + db_->Get(MakeNonCachingReadOptions(), key, &data_str);
|
| if (!status.ok()) {
|
| DVLOG(1) << "DB::Get for data failed: status=" << status.ToString();
|
| return attachment;
|
|
|