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_remover.h" | 5 #include "chrome/browser/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 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 BrowserThread::PostTask( | 340 BrowserThread::PostTask( |
341 BrowserThread::IO, FROM_HERE, | 341 BrowserThread::IO, FROM_HERE, |
342 base::Bind(&BrowsingDataRemover::ClearServerBoundCertsOnIOThread, | 342 base::Bind(&BrowsingDataRemover::ClearServerBoundCertsOnIOThread, |
343 base::Unretained(this), base::Unretained(rq_context))); | 343 base::Unretained(this), base::Unretained(rq_context))); |
344 } | 344 } |
345 } | 345 } |
346 | 346 |
347 if (remove_mask & REMOVE_LOCAL_STORAGE) { | 347 if (remove_mask & REMOVE_LOCAL_STORAGE) { |
348 waiting_for_clear_local_storage_ = true; | 348 waiting_for_clear_local_storage_ = true; |
349 if (!dom_storage_context_) | 349 if (!dom_storage_context_) |
350 dom_storage_context_ = BrowserContext::GetDOMStorageContext(profile_); | 350 dom_storage_context_ = |
| 351 BrowserContext::GetDefaultDOMStorageContext(profile_); |
351 ClearLocalStorageOnUIThread(); | 352 ClearLocalStorageOnUIThread(); |
352 } | 353 } |
353 | 354 |
354 if (remove_mask & REMOVE_INDEXEDDB || remove_mask & REMOVE_WEBSQL || | 355 if (remove_mask & REMOVE_INDEXEDDB || remove_mask & REMOVE_WEBSQL || |
355 remove_mask & REMOVE_APPCACHE || remove_mask & REMOVE_FILE_SYSTEMS) { | 356 remove_mask & REMOVE_APPCACHE || remove_mask & REMOVE_FILE_SYSTEMS) { |
356 if (!quota_manager_) | 357 if (!quota_manager_) |
357 quota_manager_ = content::BrowserContext::GetQuotaManager(profile_); | 358 quota_manager_ = content::BrowserContext::GetQuotaManager(profile_); |
358 waiting_for_clear_quota_managed_data_ = true; | 359 waiting_for_clear_quota_managed_data_ = true; |
359 BrowserThread::PostTask( | 360 BrowserThread::PostTask( |
360 BrowserThread::IO, FROM_HERE, | 361 BrowserThread::IO, FROM_HERE, |
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
863 BrowserThread::UI, FROM_HERE, | 864 BrowserThread::UI, FROM_HERE, |
864 base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts, | 865 base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts, |
865 base::Unretained(this))); | 866 base::Unretained(this))); |
866 } | 867 } |
867 | 868 |
868 void BrowsingDataRemover::OnClearedServerBoundCerts() { | 869 void BrowsingDataRemover::OnClearedServerBoundCerts() { |
869 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 870 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
870 waiting_for_clear_server_bound_certs_ = false; | 871 waiting_for_clear_server_bound_certs_ = false; |
871 NotifyAndDeleteIfDone(); | 872 NotifyAndDeleteIfDone(); |
872 } | 873 } |
OLD | NEW |