| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "android_webview/browser/net/token_binding_manager.h" | 5 #include "android_webview/browser/net/token_binding_manager.h" |
| 6 | 6 |
| 7 #include "android_webview/browser/aw_browser_context.h" | 7 #include "android_webview/browser/aw_browser_context.h" |
| 8 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
| 9 #include "content/public/browser/storage_partition.h" |
| 9 #include "net/ssl/channel_id_service.h" | 10 #include "net/ssl/channel_id_service.h" |
| 10 #include "net/ssl/channel_id_store.h" | 11 #include "net/ssl/channel_id_store.h" |
| 11 #include "net/url_request/url_request_context.h" | 12 #include "net/url_request/url_request_context.h" |
| 12 #include "net/url_request/url_request_context_getter.h" | 13 #include "net/url_request/url_request_context_getter.h" |
| 13 | 14 |
| 14 namespace android_webview { | 15 namespace android_webview { |
| 15 | 16 |
| 16 using content::BrowserThread; | 17 using content::BrowserThread; |
| 17 using net::ChannelIDService; | 18 using net::ChannelIDService; |
| 18 using net::ChannelIDStore; | 19 using net::ChannelIDStore; |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 | 78 |
| 78 TokenBindingManager* TokenBindingManager::GetInstance() { | 79 TokenBindingManager* TokenBindingManager::GetInstance() { |
| 79 return g_lazy_instance.Pointer(); | 80 return g_lazy_instance.Pointer(); |
| 80 } | 81 } |
| 81 | 82 |
| 82 TokenBindingManager::TokenBindingManager() : enabled_(false) {} | 83 TokenBindingManager::TokenBindingManager() : enabled_(false) {} |
| 83 | 84 |
| 84 void TokenBindingManager::GetKey(const std::string& host, | 85 void TokenBindingManager::GetKey(const std::string& host, |
| 85 KeyReadyCallback callback) { | 86 KeyReadyCallback callback) { |
| 86 scoped_refptr<net::URLRequestContextGetter> context_getter = | 87 scoped_refptr<net::URLRequestContextGetter> context_getter = |
| 87 AwBrowserContext::GetDefault()->GetRequestContext(); | 88 content::BrowserContext::GetDefaultStoragePartition( |
| 89 AwBrowserContext::GetDefault())->GetURLRequestContext(); |
| 88 BrowserThread::PostTask( | 90 BrowserThread::PostTask( |
| 89 BrowserThread::IO, FROM_HERE, | 91 BrowserThread::IO, FROM_HERE, |
| 90 base::Bind(&GetKeyImpl, host, callback, context_getter)); | 92 base::Bind(&GetKeyImpl, host, callback, context_getter)); |
| 91 } | 93 } |
| 92 | 94 |
| 93 void TokenBindingManager::DeleteKey(const std::string& host, | 95 void TokenBindingManager::DeleteKey(const std::string& host, |
| 94 DeletionCompleteCallback callback) { | 96 DeletionCompleteCallback callback) { |
| 95 scoped_refptr<net::URLRequestContextGetter> context_getter = | 97 scoped_refptr<net::URLRequestContextGetter> context_getter = |
| 96 AwBrowserContext::GetDefault()->GetRequestContext(); | 98 content::BrowserContext::GetDefaultStoragePartition( |
| 99 AwBrowserContext::GetDefault())->GetURLRequestContext(); |
| 97 BrowserThread::PostTask( | 100 BrowserThread::PostTask( |
| 98 BrowserThread::IO, FROM_HERE, | 101 BrowserThread::IO, FROM_HERE, |
| 99 base::Bind(&DeleteKeyImpl, host, callback, context_getter, false)); | 102 base::Bind(&DeleteKeyImpl, host, callback, context_getter, false)); |
| 100 } | 103 } |
| 101 | 104 |
| 102 void TokenBindingManager::DeleteAllKeys(DeletionCompleteCallback callback) { | 105 void TokenBindingManager::DeleteAllKeys(DeletionCompleteCallback callback) { |
| 103 scoped_refptr<net::URLRequestContextGetter> context_getter = | 106 scoped_refptr<net::URLRequestContextGetter> context_getter = |
| 104 AwBrowserContext::GetDefault()->GetRequestContext(); | 107 content::BrowserContext::GetDefaultStoragePartition( |
| 108 AwBrowserContext::GetDefault())->GetURLRequestContext(); |
| 105 BrowserThread::PostTask( | 109 BrowserThread::PostTask( |
| 106 BrowserThread::IO, FROM_HERE, | 110 BrowserThread::IO, FROM_HERE, |
| 107 base::Bind(&DeleteKeyImpl, "", callback, context_getter, true)); | 111 base::Bind(&DeleteKeyImpl, "", callback, context_getter, true)); |
| 108 } | 112 } |
| 109 | 113 |
| 110 } // namespace android_webview | 114 } // namespace android_webview |
| OLD | NEW |