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

Side by Side Diff: google_apis/gaia/oauth2_token_service_request_unittest.cc

Issue 317773003: Ensure OAuth2TokenServiceRequest::Core is destroyed on owner thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Run loop in TearDown to ensure core is freed before unit test terminates. Created 6 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 | Annotate | Revision Log
« no previous file with comments | « google_apis/gaia/oauth2_token_service_request.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "google_apis/gaia/oauth2_token_service_request.h" 5 #include "google_apis/gaia/oauth2_token_service_request.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 const std::string& client_id, 139 const std::string& client_id,
140 const ScopeSet& scopes, 140 const ScopeSet& scopes,
141 const std::string& access_token) { 141 const std::string& access_token) {
142 ++num_invalidate_token_; 142 ++num_invalidate_token_;
143 last_token_invalidated_ = access_token; 143 last_token_invalidated_ = access_token;
144 } 144 }
145 145
146 class OAuth2TokenServiceRequestTest : public testing::Test { 146 class OAuth2TokenServiceRequestTest : public testing::Test {
147 public: 147 public:
148 virtual void SetUp() OVERRIDE; 148 virtual void SetUp() OVERRIDE;
149 virtual void TearDown() OVERRIDE;
149 150
150 protected: 151 protected:
151 class Provider : public OAuth2TokenServiceRequest::TokenServiceProvider { 152 class Provider : public OAuth2TokenServiceRequest::TokenServiceProvider {
152 public: 153 public:
153 Provider(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 154 Provider(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
154 OAuth2TokenService* token_service); 155 OAuth2TokenService* token_service);
155 156
156 virtual scoped_refptr<base::SingleThreadTaskRunner> 157 virtual scoped_refptr<base::SingleThreadTaskRunner>
157 GetTokenServiceTaskRunner() OVERRIDE; 158 GetTokenServiceTaskRunner() OVERRIDE;
158 virtual OAuth2TokenService* GetTokenService() OVERRIDE; 159 virtual OAuth2TokenService* GetTokenService() OVERRIDE;
(...skipping 11 matching lines...) Expand all
170 }; 171 };
171 172
172 void OAuth2TokenServiceRequestTest::SetUp() { 173 void OAuth2TokenServiceRequestTest::SetUp() {
173 scopes_.insert(kScope); 174 scopes_.insert(kScope);
174 oauth2_service_.reset(new MockOAuth2TokenService); 175 oauth2_service_.reset(new MockOAuth2TokenService);
175 oauth2_service_->AddAccount(kAccountId); 176 oauth2_service_->AddAccount(kAccountId);
176 provider_.reset( 177 provider_.reset(
177 new Provider(base::MessageLoopProxy::current(), oauth2_service_.get())); 178 new Provider(base::MessageLoopProxy::current(), oauth2_service_.get()));
178 } 179 }
179 180
181 void OAuth2TokenServiceRequestTest::TearDown() {
182 // Run the loop to execute any pending tasks that may free resources.
183 ui_loop_.RunUntilIdle();
184 }
185
180 OAuth2TokenServiceRequestTest::Provider::Provider( 186 OAuth2TokenServiceRequestTest::Provider::Provider(
181 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 187 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
182 OAuth2TokenService* token_service) 188 OAuth2TokenService* token_service)
183 : task_runner_(task_runner), token_service_(token_service) { 189 : task_runner_(task_runner), token_service_(token_service) {
184 } 190 }
185 191
186 scoped_refptr<base::SingleThreadTaskRunner> 192 scoped_refptr<base::SingleThreadTaskRunner>
187 OAuth2TokenServiceRequestTest::Provider::GetTokenServiceTaskRunner() { 193 OAuth2TokenServiceRequestTest::Provider::GetTokenServiceTaskRunner() {
188 return task_runner_; 194 return task_runner_;
189 } 195 }
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 OAuth2TokenServiceRequest::InvalidateToken( 254 OAuth2TokenServiceRequest::InvalidateToken(
249 provider_.get(), kAccountId, scopes_, kAccessToken); 255 provider_.get(), kAccountId, scopes_, kAccessToken);
250 ui_loop_.RunUntilIdle(); 256 ui_loop_.RunUntilIdle();
251 EXPECT_EQ(0, consumer_.num_get_token_success_); 257 EXPECT_EQ(0, consumer_.num_get_token_success_);
252 EXPECT_EQ(0, consumer_.num_get_token_failure_); 258 EXPECT_EQ(0, consumer_.num_get_token_failure_);
253 EXPECT_EQ(kAccessToken, oauth2_service_->last_token_invalidated()); 259 EXPECT_EQ(kAccessToken, oauth2_service_->last_token_invalidated());
254 EXPECT_EQ(1, oauth2_service_->num_invalidate_token()); 260 EXPECT_EQ(1, oauth2_service_->num_invalidate_token());
255 } 261 }
256 262
257 } // namespace 263 } // namespace
OLDNEW
« no previous file with comments | « google_apis/gaia/oauth2_token_service_request.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698