| Index: components/sync/core_impl/attachments/attachment_store_test_template.h
|
| diff --git a/sync/internal_api/attachments/attachment_store_test_template.h b/components/sync/core_impl/attachments/attachment_store_test_template.h
|
| similarity index 96%
|
| rename from sync/internal_api/attachments/attachment_store_test_template.h
|
| rename to components/sync/core_impl/attachments/attachment_store_test_template.h
|
| index 8ad595fb0f9ddedd012360be51603b30a6ae33b2..e9d186928a51895614013465d5eb534a2a127555 100644
|
| --- a/sync/internal_api/attachments/attachment_store_test_template.h
|
| +++ b/components/sync/core_impl/attachments/attachment_store_test_template.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_INTERNAL_API_ATTACHMENTS_ATTACHMENT_STORE_TEST_TEMPLATE_H_
|
| -#define SYNC_INTERNAL_API_ATTACHMENTS_ATTACHMENT_STORE_TEST_TEMPLATE_H_
|
| +#ifndef COMPONENTS_SYNC_CORE_IMPL_ATTACHMENTS_ATTACHMENT_STORE_TEST_TEMPLATE_H_
|
| +#define COMPONENTS_SYNC_CORE_IMPL_ATTACHMENTS_ATTACHMENT_STORE_TEST_TEMPLATE_H_
|
|
|
| #include <memory>
|
| #include <utility>
|
| @@ -13,10 +13,10 @@
|
| #include "base/memory/ref_counted_memory.h"
|
| #include "base/run_loop.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| -#include "sync/api/attachments/attachment.h"
|
| -#include "sync/api/attachments/attachment_store.h"
|
| -#include "sync/internal_api/public/attachments/attachment_util.h"
|
| -#include "sync/protocol/sync.pb.h"
|
| +#include "components/sync/api/attachments/attachment.h"
|
| +#include "components/sync/api/attachments/attachment_store.h"
|
| +#include "components/sync/core/attachments/attachment_util.h"
|
| +#include "components/sync/protocol/sync.pb.h"
|
| #include "testing/gmock/include/gmock/gmock-matchers.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -71,12 +71,10 @@ class AttachmentStoreTest : public testing::Test {
|
|
|
| Clear();
|
| read_callback = base::Bind(&AttachmentStoreTest::CopyResultAttachments,
|
| - base::Unretained(this),
|
| - &result,
|
| - &attachments,
|
| + base::Unretained(this), &result, &attachments,
|
| &failed_attachment_ids);
|
| - write_callback = base::Bind(
|
| - &AttachmentStoreTest::CopyResult, base::Unretained(this), &result);
|
| + write_callback = base::Bind(&AttachmentStoreTest::CopyResult,
|
| + base::Unretained(this), &result);
|
| drop_callback = write_callback;
|
| read_metadata_callback =
|
| base::Bind(&AttachmentStoreTest::CopyResultMetadata,
|
| @@ -521,4 +519,4 @@ REGISTER_TYPED_TEST_CASE_P(AttachmentStoreTest,
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_INTERNAL_API_ATTACHMENTS_ATTACHMENT_STORE_TEST_TEMPLATE_H_
|
| +#endif // COMPONENTS_SYNC_CORE_IMPL_ATTACHMENTS_ATTACHMENT_STORE_TEST_TEMPLATE_H_
|
|
|