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

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

Issue 1170623003: Revert "content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/thread_task_runner_handle.h" 10 #include "base/message_loop/message_loop_proxy.h"
11 11
12 using base::MessageLoopProxy;
12 using testing::_; 13 using testing::_;
13 using testing::Invoke; 14 using testing::Invoke;
14 15
15 namespace content { 16 namespace content {
16 17
17 FakeAccessTokenStore::FakeAccessTokenStore() : originating_task_runner_(NULL) { 18 FakeAccessTokenStore::FakeAccessTokenStore()
19 : originating_message_loop_(NULL) {
18 ON_CALL(*this, LoadAccessTokens(_)) 20 ON_CALL(*this, LoadAccessTokens(_))
19 .WillByDefault(Invoke(this, 21 .WillByDefault(Invoke(this,
20 &FakeAccessTokenStore::DefaultLoadAccessTokens)); 22 &FakeAccessTokenStore::DefaultLoadAccessTokens));
21 ON_CALL(*this, SaveAccessToken(_, _)) 23 ON_CALL(*this, SaveAccessToken(_, _))
22 .WillByDefault(Invoke(this, 24 .WillByDefault(Invoke(this,
23 &FakeAccessTokenStore::DefaultSaveAccessToken)); 25 &FakeAccessTokenStore::DefaultSaveAccessToken));
24 } 26 }
25 27
26 void FakeAccessTokenStore::NotifyDelegateTokensLoaded() { 28 void FakeAccessTokenStore::NotifyDelegateTokensLoaded() {
27 DCHECK(originating_task_runner_); 29 DCHECK(originating_message_loop_);
28 if (!originating_task_runner_->BelongsToCurrentThread()) { 30 if (!originating_message_loop_->BelongsToCurrentThread()) {
29 originating_task_runner_->PostTask( 31 originating_message_loop_->PostTask(
30 FROM_HERE, 32 FROM_HERE,
31 base::Bind(&FakeAccessTokenStore::NotifyDelegateTokensLoaded, this)); 33 base::Bind(&FakeAccessTokenStore::NotifyDelegateTokensLoaded, this));
32 return; 34 return;
33 } 35 }
34 36
35 net::URLRequestContextGetter* context_getter = NULL; 37 net::URLRequestContextGetter* context_getter = NULL;
36 callback_.Run(access_token_set_, context_getter); 38 callback_.Run(access_token_set_, context_getter);
37 } 39 }
38 40
39 void FakeAccessTokenStore::DefaultLoadAccessTokens( 41 void FakeAccessTokenStore::DefaultLoadAccessTokens(
40 const LoadAccessTokensCallbackType& callback) { 42 const LoadAccessTokensCallbackType& callback) {
41 originating_task_runner_ = base::ThreadTaskRunnerHandle::Get().get(); 43 originating_message_loop_ = MessageLoopProxy::current().get();
42 callback_ = callback; 44 callback_ = callback;
43 } 45 }
44 46
45 void FakeAccessTokenStore::DefaultSaveAccessToken( 47 void FakeAccessTokenStore::DefaultSaveAccessToken(
46 const GURL& server_url, const base::string16& access_token) { 48 const GURL& server_url, const base::string16& access_token) {
47 DCHECK(server_url.is_valid()); 49 DCHECK(server_url.is_valid());
48 access_token_set_[server_url] = access_token; 50 access_token_set_[server_url] = access_token;
49 } 51 }
50 52
51 FakeAccessTokenStore::~FakeAccessTokenStore() {} 53 FakeAccessTokenStore::~FakeAccessTokenStore() {}
52 54
53 } // namespace content 55 } // 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