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

Side by Side Diff: content/browser/geolocation/fake_access_token_store.cc

Issue 1159623009: content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test build fix. Created 5 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/browser/geolocation/fake_access_token_store.h" 5 #include "content/browser/geolocation/fake_access_token_store.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/thread_task_runner_handle.h"
11 11
12 using base::MessageLoopProxy;
13 using testing::_; 12 using testing::_;
14 using testing::Invoke; 13 using testing::Invoke;
15 14
16 namespace content { 15 namespace content {
17 16
18 FakeAccessTokenStore::FakeAccessTokenStore() 17 FakeAccessTokenStore::FakeAccessTokenStore() : originating_task_runner_(NULL) {
19 : originating_message_loop_(NULL) {
20 ON_CALL(*this, LoadAccessTokens(_)) 18 ON_CALL(*this, LoadAccessTokens(_))
21 .WillByDefault(Invoke(this, 19 .WillByDefault(Invoke(this,
22 &FakeAccessTokenStore::DefaultLoadAccessTokens)); 20 &FakeAccessTokenStore::DefaultLoadAccessTokens));
23 ON_CALL(*this, SaveAccessToken(_, _)) 21 ON_CALL(*this, SaveAccessToken(_, _))
24 .WillByDefault(Invoke(this, 22 .WillByDefault(Invoke(this,
25 &FakeAccessTokenStore::DefaultSaveAccessToken)); 23 &FakeAccessTokenStore::DefaultSaveAccessToken));
26 } 24 }
27 25
28 void FakeAccessTokenStore::NotifyDelegateTokensLoaded() { 26 void FakeAccessTokenStore::NotifyDelegateTokensLoaded() {
29 DCHECK(originating_message_loop_); 27 DCHECK(originating_task_runner_);
30 if (!originating_message_loop_->BelongsToCurrentThread()) { 28 if (!originating_task_runner_->BelongsToCurrentThread()) {
31 originating_message_loop_->PostTask( 29 originating_task_runner_->PostTask(
32 FROM_HERE, 30 FROM_HERE,
33 base::Bind(&FakeAccessTokenStore::NotifyDelegateTokensLoaded, this)); 31 base::Bind(&FakeAccessTokenStore::NotifyDelegateTokensLoaded, this));
34 return; 32 return;
35 } 33 }
36 34
37 net::URLRequestContextGetter* context_getter = NULL; 35 net::URLRequestContextGetter* context_getter = NULL;
38 callback_.Run(access_token_set_, context_getter); 36 callback_.Run(access_token_set_, context_getter);
39 } 37 }
40 38
41 void FakeAccessTokenStore::DefaultLoadAccessTokens( 39 void FakeAccessTokenStore::DefaultLoadAccessTokens(
42 const LoadAccessTokensCallbackType& callback) { 40 const LoadAccessTokensCallbackType& callback) {
43 originating_message_loop_ = MessageLoopProxy::current().get(); 41 originating_task_runner_ = base::ThreadTaskRunnerHandle::Get().get();
44 callback_ = callback; 42 callback_ = callback;
45 } 43 }
46 44
47 void FakeAccessTokenStore::DefaultSaveAccessToken( 45 void FakeAccessTokenStore::DefaultSaveAccessToken(
48 const GURL& server_url, const base::string16& access_token) { 46 const GURL& server_url, const base::string16& access_token) {
49 DCHECK(server_url.is_valid()); 47 DCHECK(server_url.is_valid());
50 access_token_set_[server_url] = access_token; 48 access_token_set_[server_url] = access_token;
51 } 49 }
52 50
53 FakeAccessTokenStore::~FakeAccessTokenStore() {} 51 FakeAccessTokenStore::~FakeAccessTokenStore() {}
54 52
55 } // namespace content 53 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/geolocation/fake_access_token_store.h ('k') | content/browser/geolocation/geolocation_provider_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698