OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/browsing_data/browsing_data_remover.h" | 5 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
105 base::Time delete_end) | 105 base::Time delete_end) |
106 : profile_(profile), | 106 : profile_(profile), |
107 quota_manager_(NULL), | 107 quota_manager_(NULL), |
108 dom_storage_context_(NULL), | 108 dom_storage_context_(NULL), |
109 special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()), | 109 special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()), |
110 delete_begin_(delete_begin), | 110 delete_begin_(delete_begin), |
111 delete_end_(delete_end), | 111 delete_end_(delete_end), |
112 next_cache_state_(STATE_NONE), | 112 next_cache_state_(STATE_NONE), |
113 cache_(NULL), | 113 cache_(NULL), |
114 main_context_getter_(profile->GetRequestContext()), | 114 main_context_getter_(profile->GetRequestContext()), |
115 media_context_getter_(profile->GetRequestContextForMedia()), | 115 media_context_getter_(profile->GetRequestContextForMedia(-1)), |
awong
2012/08/17 18:23:16
Ick...on the magic -1 everywhere.
I had been usin
Charlie Reis
2012/08/17 21:04:38
I've switched it to use a GetDefaultRequestContext
| |
116 deauthorize_content_licenses_request_id_(0), | 116 deauthorize_content_licenses_request_id_(0), |
117 waiting_for_clear_cache_(false), | 117 waiting_for_clear_cache_(false), |
118 waiting_for_clear_nacl_cache_(false), | 118 waiting_for_clear_nacl_cache_(false), |
119 waiting_for_clear_cookies_count_(0), | 119 waiting_for_clear_cookies_count_(0), |
120 waiting_for_clear_history_(false), | 120 waiting_for_clear_history_(false), |
121 waiting_for_clear_local_storage_(false), | 121 waiting_for_clear_local_storage_(false), |
122 waiting_for_clear_networking_history_(false), | 122 waiting_for_clear_networking_history_(false), |
123 waiting_for_clear_server_bound_certs_(false), | 123 waiting_for_clear_server_bound_certs_(false), |
124 waiting_for_clear_plugin_data_(false), | 124 waiting_for_clear_plugin_data_(false), |
125 waiting_for_clear_quota_managed_data_(false), | 125 waiting_for_clear_quota_managed_data_(false), |
(...skipping 15 matching lines...) Expand all Loading... | |
141 base::Time delete_end) | 141 base::Time delete_end) |
142 : profile_(profile), | 142 : profile_(profile), |
143 quota_manager_(NULL), | 143 quota_manager_(NULL), |
144 dom_storage_context_(NULL), | 144 dom_storage_context_(NULL), |
145 special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()), | 145 special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()), |
146 delete_begin_(CalculateBeginDeleteTime(time_period)), | 146 delete_begin_(CalculateBeginDeleteTime(time_period)), |
147 delete_end_(delete_end), | 147 delete_end_(delete_end), |
148 next_cache_state_(STATE_NONE), | 148 next_cache_state_(STATE_NONE), |
149 cache_(NULL), | 149 cache_(NULL), |
150 main_context_getter_(profile->GetRequestContext()), | 150 main_context_getter_(profile->GetRequestContext()), |
151 media_context_getter_(profile->GetRequestContextForMedia()), | 151 media_context_getter_(profile->GetRequestContextForMedia(-1)), |
152 deauthorize_content_licenses_request_id_(0), | 152 deauthorize_content_licenses_request_id_(0), |
153 waiting_for_clear_cache_(false), | 153 waiting_for_clear_cache_(false), |
154 waiting_for_clear_nacl_cache_(false), | 154 waiting_for_clear_nacl_cache_(false), |
155 waiting_for_clear_cookies_count_(0), | 155 waiting_for_clear_cookies_count_(0), |
156 waiting_for_clear_history_(false), | 156 waiting_for_clear_history_(false), |
157 waiting_for_clear_local_storage_(false), | 157 waiting_for_clear_local_storage_(false), |
158 waiting_for_clear_networking_history_(false), | 158 waiting_for_clear_networking_history_(false), |
159 waiting_for_clear_server_bound_certs_(false), | 159 waiting_for_clear_server_bound_certs_(false), |
160 waiting_for_clear_plugin_data_(false), | 160 waiting_for_clear_plugin_data_(false), |
161 waiting_for_clear_quota_managed_data_(false), | 161 waiting_for_clear_quota_managed_data_(false), |
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
895 BrowserThread::UI, FROM_HERE, | 895 BrowserThread::UI, FROM_HERE, |
896 base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts, | 896 base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts, |
897 base::Unretained(this))); | 897 base::Unretained(this))); |
898 } | 898 } |
899 | 899 |
900 void BrowsingDataRemover::OnClearedServerBoundCerts() { | 900 void BrowsingDataRemover::OnClearedServerBoundCerts() { |
901 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 901 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
902 waiting_for_clear_server_bound_certs_ = false; | 902 waiting_for_clear_server_bound_certs_ = false; |
903 NotifyAndDeleteIfDone(); | 903 NotifyAndDeleteIfDone(); |
904 } | 904 } |
OLD | NEW |