Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Side by Side Diff: components/sync/engine_impl/attachments/attachment_downloader_impl_unittest.cc

Issue 2915453002: Deprecate NonThreadSafe in components/sync in favor of SequenceChecker. (Closed)
Patch Set: fix comment Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "components/sync/engine_impl/attachments/attachment_downloader_impl.h" 5 #include "components/sync/engine_impl/attachments/attachment_downloader_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/run_loop.h" 15 #include "base/run_loop.h"
16 #include "base/sequence_checker.h"
16 #include "base/single_thread_task_runner.h" 17 #include "base/single_thread_task_runner.h"
17 #include "base/test/histogram_tester.h" 18 #include "base/test/histogram_tester.h"
18 #include "base/threading/thread_task_runner_handle.h" 19 #include "base/threading/thread_task_runner_handle.h"
19 #include "components/sync/engine/attachments/attachment_util.h" 20 #include "components/sync/engine/attachments/attachment_util.h"
20 #include "components/sync/engine_impl/attachments/attachment_uploader_impl.h" 21 #include "components/sync/engine_impl/attachments/attachment_uploader_impl.h"
21 #include "components/sync/model/attachments/attachment.h" 22 #include "components/sync/model/attachments/attachment.h"
22 #include "google_apis/gaia/fake_oauth2_token_service.h" 23 #include "google_apis/gaia/fake_oauth2_token_service.h"
23 #include "google_apis/gaia/gaia_constants.h" 24 #include "google_apis/gaia/gaia_constants.h"
24 #include "net/http/http_response_headers.h" 25 #include "net/http/http_response_headers.h"
25 #include "net/url_request/test_url_fetcher_factory.h" 26 #include "net/url_request/test_url_fetcher_factory.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 99
99 void MockOAuth2TokenService::InvalidateAccessTokenImpl( 100 void MockOAuth2TokenService::InvalidateAccessTokenImpl(
100 const std::string& account_id, 101 const std::string& account_id,
101 const std::string& client_id, 102 const std::string& client_id,
102 const ScopeSet& scopes, 103 const ScopeSet& scopes,
103 const std::string& access_token) { 104 const std::string& access_token) {
104 ++num_invalidate_token_; 105 ++num_invalidate_token_;
105 } 106 }
106 107
107 class TokenServiceProvider 108 class TokenServiceProvider
108 : public OAuth2TokenServiceRequest::TokenServiceProvider, 109 : public OAuth2TokenServiceRequest::TokenServiceProvider {
109 base::NonThreadSafe {
110 public: 110 public:
111 explicit TokenServiceProvider(OAuth2TokenService* token_service); 111 explicit TokenServiceProvider(OAuth2TokenService* token_service);
112 112
113 // OAuth2TokenService::TokenServiceProvider implementation. 113 // OAuth2TokenService::TokenServiceProvider implementation.
114 scoped_refptr<base::SingleThreadTaskRunner> GetTokenServiceTaskRunner() 114 scoped_refptr<base::SingleThreadTaskRunner> GetTokenServiceTaskRunner()
115 override; 115 override;
116 OAuth2TokenService* GetTokenService() override; 116 OAuth2TokenService* GetTokenService() override;
117 117
118 private: 118 private:
119 ~TokenServiceProvider() override; 119 ~TokenServiceProvider() override;
120 120
121 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 121 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
122 OAuth2TokenService* token_service_; 122 OAuth2TokenService* token_service_;
123
124 SEQUENCE_CHECKER(sequence_checker_);
123 }; 125 };
124 126
125 TokenServiceProvider::TokenServiceProvider(OAuth2TokenService* token_service) 127 TokenServiceProvider::TokenServiceProvider(OAuth2TokenService* token_service)
126 : task_runner_(base::ThreadTaskRunnerHandle::Get()), 128 : task_runner_(base::ThreadTaskRunnerHandle::Get()),
127 token_service_(token_service) { 129 token_service_(token_service) {
128 DCHECK(token_service_); 130 DCHECK(token_service_);
129 } 131 }
130 132
131 TokenServiceProvider::~TokenServiceProvider() {} 133 TokenServiceProvider::~TokenServiceProvider() {
134 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
135 }
132 136
133 scoped_refptr<base::SingleThreadTaskRunner> 137 scoped_refptr<base::SingleThreadTaskRunner>
134 TokenServiceProvider::GetTokenServiceTaskRunner() { 138 TokenServiceProvider::GetTokenServiceTaskRunner() {
135 return task_runner_; 139 return task_runner_;
136 } 140 }
137 141
138 OAuth2TokenService* TokenServiceProvider::GetTokenService() { 142 OAuth2TokenService* TokenServiceProvider::GetTokenService() {
139 DCHECK(task_runner_->BelongsToCurrentThread()); 143 DCHECK(task_runner_->BelongsToCurrentThread());
140 return token_service_; 144 return token_service_;
141 } 145 }
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 raw += "\n"; 531 raw += "\n";
528 std::replace(raw.begin(), raw.end(), '\n', '\0'); 532 std::replace(raw.begin(), raw.end(), '\n', '\0');
529 scoped_refptr<net::HttpResponseHeaders> headers( 533 scoped_refptr<net::HttpResponseHeaders> headers(
530 new net::HttpResponseHeaders(raw)); 534 new net::HttpResponseHeaders(raw));
531 uint32_t extracted; 535 uint32_t extracted;
532 ASSERT_FALSE( 536 ASSERT_FALSE(
533 AttachmentDownloaderImpl::ExtractCrc32c(headers.get(), &extracted)); 537 AttachmentDownloaderImpl::ExtractCrc32c(headers.get(), &extracted));
534 } 538 }
535 539
536 } // namespace syncer 540 } // namespace syncer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698