| Index: components/sync/core_impl/attachments/attachment_downloader_impl_unittest.cc
|
| diff --git a/sync/internal_api/attachments/attachment_downloader_impl_unittest.cc b/components/sync/core_impl/attachments/attachment_downloader_impl_unittest.cc
|
| similarity index 96%
|
| rename from sync/internal_api/attachments/attachment_downloader_impl_unittest.cc
|
| rename to components/sync/core_impl/attachments/attachment_downloader_impl_unittest.cc
|
| index 8ddebdac2791f61a1349ec25682c537b774e34e7..fd4c271790a0826584071f5d74a12a6d307cf3fb 100644
|
| --- a/sync/internal_api/attachments/attachment_downloader_impl_unittest.cc
|
| +++ b/components/sync/core_impl/attachments/attachment_downloader_impl_unittest.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/attachment_downloader_impl.h"
|
| +#include "components/sync/core/attachments/attachment_downloader_impl.h"
|
|
|
| #include <stdint.h>
|
|
|
| @@ -16,15 +16,15 @@
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/test/histogram_tester.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| +#include "components/sync/api/attachments/attachment.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/core/attachments/attachment_uploader_impl.h"
|
| +#include "components/sync/core/attachments/attachment_util.h"
|
| #include "google_apis/gaia/fake_oauth2_token_service.h"
|
| #include "google_apis/gaia/gaia_constants.h"
|
| #include "net/http/http_response_headers.h"
|
| #include "net/url_request/test_url_fetcher_factory.h"
|
| #include "net/url_request/url_request_test_util.h"
|
| -#include "sync/api/attachments/attachment.h"
|
| -#include "sync/internal_api/public/attachments/attachment_uploader_impl.h"
|
| -#include "sync/internal_api/public/attachments/attachment_util.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "third_party/leveldatabase/src/util/crc32c.h"
|
|
|
| @@ -129,8 +129,7 @@ TokenServiceProvider::TokenServiceProvider(OAuth2TokenService* token_service)
|
| DCHECK(token_service_);
|
| }
|
|
|
| -TokenServiceProvider::~TokenServiceProvider() {
|
| -}
|
| +TokenServiceProvider::~TokenServiceProvider() {}
|
|
|
| scoped_refptr<base::SingleThreadTaskRunner>
|
| TokenServiceProvider::GetTokenServiceTaskRunner() {
|
| @@ -157,10 +156,10 @@ class AttachmentDownloaderImplTest : public testing::Test {
|
|
|
| AttachmentDownloaderImplTest()
|
| : num_completed_downloads_(0),
|
| - attachment_id_(
|
| - Attachment::Create(new base::RefCountedStaticMemory(
|
| - kAttachmentContent,
|
| - strlen(kAttachmentContent))).GetId()) {}
|
| + attachment_id_(Attachment::Create(new base::RefCountedStaticMemory(
|
| + kAttachmentContent,
|
| + strlen(kAttachmentContent)))
|
| + .GetId()) {}
|
|
|
| void SetUp() override;
|
| void TearDown() override;
|
| @@ -176,8 +175,7 @@ class AttachmentDownloaderImplTest : public testing::Test {
|
| AttachmentDownloader::DownloadCallback download_callback(
|
| const AttachmentId& id) {
|
| return base::Bind(&AttachmentDownloaderImplTest::DownloadDone,
|
| - base::Unretained(this),
|
| - id);
|
| + base::Unretained(this), id);
|
| }
|
|
|
| // Respond with |response_code| and hash header of type |hash_header_type|.
|
| @@ -461,7 +459,6 @@ TEST_F(AttachmentDownloaderImplTest, IdHashDoesNotMatch) {
|
| VerifyDownloadResult(id1, AttachmentDownloader::DOWNLOAD_UNSPECIFIED_ERROR);
|
| }
|
|
|
| -
|
| // Verify that extract fails when there is no headers object.
|
| TEST_F(AttachmentDownloaderImplTest, ExtractCrc32c_NoHeaders) {
|
| uint32_t extracted;
|
|
|