OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "sync/api/attachments/attachment_downloader.h" | 5 #include "sync/api/attachments/attachment_downloader.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| 11 #include "base/thread_task_runner_handle.h" |
11 #include "google_apis/gaia/fake_oauth2_token_service.h" | 12 #include "google_apis/gaia/fake_oauth2_token_service.h" |
12 #include "google_apis/gaia/gaia_constants.h" | 13 #include "google_apis/gaia/gaia_constants.h" |
13 #include "net/url_request/test_url_fetcher_factory.h" | 14 #include "net/url_request/test_url_fetcher_factory.h" |
14 #include "net/url_request/url_request_test_util.h" | 15 #include "net/url_request/url_request_test_util.h" |
15 #include "sync/api/attachments/attachment.h" | 16 #include "sync/api/attachments/attachment.h" |
16 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" |
17 | 18 |
18 namespace syncer { | 19 namespace syncer { |
19 | 20 |
20 namespace { | 21 namespace { |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 virtual scoped_refptr<base::SingleThreadTaskRunner> | 105 virtual scoped_refptr<base::SingleThreadTaskRunner> |
105 GetTokenServiceTaskRunner() OVERRIDE; | 106 GetTokenServiceTaskRunner() OVERRIDE; |
106 virtual OAuth2TokenService* GetTokenService() OVERRIDE; | 107 virtual OAuth2TokenService* GetTokenService() OVERRIDE; |
107 | 108 |
108 private: | 109 private: |
109 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; | 110 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
110 OAuth2TokenService* token_service_; | 111 OAuth2TokenService* token_service_; |
111 }; | 112 }; |
112 | 113 |
113 TokenServiceProvider::TokenServiceProvider(OAuth2TokenService* token_service) | 114 TokenServiceProvider::TokenServiceProvider(OAuth2TokenService* token_service) |
114 : task_runner_(base::MessageLoopProxy::current()), | 115 : task_runner_(base::ThreadTaskRunnerHandle::Get()), |
115 token_service_(token_service) { | 116 token_service_(token_service) { |
116 DCHECK(token_service_); | 117 DCHECK(token_service_); |
117 } | 118 } |
118 | 119 |
119 TokenServiceProvider::~TokenServiceProvider() { | 120 TokenServiceProvider::~TokenServiceProvider() { |
120 } | 121 } |
121 | 122 |
122 scoped_refptr<base::SingleThreadTaskRunner> | 123 scoped_refptr<base::SingleThreadTaskRunner> |
123 TokenServiceProvider::GetTokenServiceTaskRunner() { | 124 TokenServiceProvider::GetTokenServiceTaskRunner() { |
124 return task_runner_; | 125 return task_runner_; |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 GoogleServiceAuthError::AuthErrorNone()); | 348 GoogleServiceAuthError::AuthErrorNone()); |
348 RunMessageLoop(); | 349 RunMessageLoop(); |
349 // Fail URLFetcher. This should trigger download failure. Access token | 350 // Fail URLFetcher. This should trigger download failure. Access token |
350 // shouldn't be invalidated. | 351 // shouldn't be invalidated. |
351 CompleteDownload(net::HTTP_SERVICE_UNAVAILABLE); | 352 CompleteDownload(net::HTTP_SERVICE_UNAVAILABLE); |
352 EXPECT_EQ(0, token_service()->num_invalidate_token()); | 353 EXPECT_EQ(0, token_service()->num_invalidate_token()); |
353 VerifyDownloadResult(id1, AttachmentDownloader::DOWNLOAD_UNSPECIFIED_ERROR); | 354 VerifyDownloadResult(id1, AttachmentDownloader::DOWNLOAD_UNSPECIFIED_ERROR); |
354 } | 355 } |
355 | 356 |
356 } // namespace syncer | 357 } // namespace syncer |
OLD | NEW |