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" |
11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
12 #include "base/callback.h" | 12 #include "base/callback.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/platform_file.h" | 14 #include "base/platform_file.h" |
15 #include "base/prefs/pref_service.h" | 15 #include "base/prefs/pref_service.h" |
16 #include "chrome/browser/autofill/personal_data_manager_factory.h" | 16 #include "chrome/browser/autofill/personal_data_manager_factory.h" |
17 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
18 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 18 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
19 #include "chrome/browser/chrome_notification_types.h" | 19 #include "chrome/browser/chrome_notification_types.h" |
20 #include "chrome/browser/download/download_prefs.h" | 20 #include "chrome/browser/download/download_prefs.h" |
21 #include "chrome/browser/download/download_service_factory.h" | 21 #include "chrome/browser/download/download_service_factory.h" |
22 #include "chrome/browser/extensions/activity_log/activity_log.h" | 22 #include "chrome/browser/extensions/activity_log/activity_log.h" |
23 #include "chrome/browser/extensions/extension_service.h" | 23 #include "chrome/browser/extensions/extension_service.h" |
24 #include "chrome/browser/extensions/extension_special_storage_policy.h" | 24 #include "chrome/browser/extensions/extension_special_storage_policy.h" |
25 #include "chrome/browser/history/history_service.h" | 25 #include "chrome/browser/history/history_service.h" |
26 #include "chrome/browser/history/history_service_factory.h" | 26 #include "chrome/browser/history/history_service_factory.h" |
27 #include "chrome/browser/io_thread.h" | 27 #include "chrome/browser/io_thread.h" |
| 28 #include "chrome/browser/media/media_device_id_salt.h" |
28 #include "chrome/browser/nacl_host/nacl_browser.h" | 29 #include "chrome/browser/nacl_host/nacl_browser.h" |
29 #include "chrome/browser/nacl_host/pnacl_host.h" | 30 #include "chrome/browser/nacl_host/pnacl_host.h" |
30 #include "chrome/browser/net/chrome_url_request_context.h" | 31 #include "chrome/browser/net/chrome_url_request_context.h" |
31 #include "chrome/browser/net/predictor.h" | 32 #include "chrome/browser/net/predictor.h" |
32 #include "chrome/browser/password_manager/password_store.h" | 33 #include "chrome/browser/password_manager/password_store.h" |
33 #include "chrome/browser/password_manager/password_store_factory.h" | 34 #include "chrome/browser/password_manager/password_store_factory.h" |
34 #include "chrome/browser/predictors/logged_in_predictor_table.h" | 35 #include "chrome/browser/predictors/logged_in_predictor_table.h" |
35 #include "chrome/browser/predictors/predictor_database.h" | 36 #include "chrome/browser/predictors/predictor_database.h" |
36 #include "chrome/browser/predictors/predictor_database_factory.h" | 37 #include "chrome/browser/predictors/predictor_database_factory.h" |
37 #include "chrome/browser/prerender/prerender_manager.h" | 38 #include "chrome/browser/prerender/prerender_manager.h" |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
416 net::URLRequestContextGetter* sb_context = | 417 net::URLRequestContextGetter* sb_context = |
417 sb_service->url_request_context(); | 418 sb_service->url_request_context(); |
418 ++waiting_for_clear_cookies_count_; | 419 ++waiting_for_clear_cookies_count_; |
419 BrowserThread::PostTask( | 420 BrowserThread::PostTask( |
420 BrowserThread::IO, FROM_HERE, | 421 BrowserThread::IO, FROM_HERE, |
421 base::Bind(&BrowsingDataRemover::ClearCookiesOnIOThread, | 422 base::Bind(&BrowsingDataRemover::ClearCookiesOnIOThread, |
422 base::Unretained(this), base::Unretained(sb_context))); | 423 base::Unretained(this), base::Unretained(sb_context))); |
423 } | 424 } |
424 } | 425 } |
425 #endif | 426 #endif |
| 427 MediaDeviceIDSalt::Reset(profile_->GetPrefs()); |
426 } | 428 } |
427 | 429 |
428 // Server bound certs are not separated for protected and unprotected web | 430 // Server bound certs are not separated for protected and unprotected web |
429 // origins. We check the origin_set_mask_ to prevent unintended deletion. | 431 // origins. We check the origin_set_mask_ to prevent unintended deletion. |
430 if (remove_mask & REMOVE_SERVER_BOUND_CERTS && | 432 if (remove_mask & REMOVE_SERVER_BOUND_CERTS && |
431 origin_set_mask_ & BrowsingDataHelper::UNPROTECTED_WEB) { | 433 origin_set_mask_ & BrowsingDataHelper::UNPROTECTED_WEB) { |
432 content::RecordAction( | 434 content::RecordAction( |
433 UserMetricsAction("ClearBrowsingData_ServerBoundCerts")); | 435 UserMetricsAction("ClearBrowsingData_ServerBoundCerts")); |
434 // Since we are running on the UI thread don't call GetURLRequestContext(). | 436 // Since we are running on the UI thread don't call GetURLRequestContext(). |
435 net::URLRequestContextGetter* rq_context = profile_->GetRequestContext(); | 437 net::URLRequestContextGetter* rq_context = profile_->GetRequestContext(); |
(...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1180 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1182 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
1181 waiting_for_clear_autofill_origin_urls_ = false; | 1183 waiting_for_clear_autofill_origin_urls_ = false; |
1182 NotifyAndDeleteIfDone(); | 1184 NotifyAndDeleteIfDone(); |
1183 } | 1185 } |
1184 | 1186 |
1185 void BrowsingDataRemover::OnClearWebRTCIdentityStore() { | 1187 void BrowsingDataRemover::OnClearWebRTCIdentityStore() { |
1186 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1188 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
1187 waiting_for_clear_webrtc_identity_store_ = false; | 1189 waiting_for_clear_webrtc_identity_store_ = false; |
1188 NotifyAndDeleteIfDone(); | 1190 NotifyAndDeleteIfDone(); |
1189 } | 1191 } |
OLD | NEW |