| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 #include "net/http/transport_security_state.h" | 69 #include "net/http/transport_security_state.h" |
| 70 #include "net/ssl/server_bound_cert_service.h" | 70 #include "net/ssl/server_bound_cert_service.h" |
| 71 #include "net/ssl/server_bound_cert_store.h" | 71 #include "net/ssl/server_bound_cert_store.h" |
| 72 #include "net/url_request/url_request_context.h" | 72 #include "net/url_request/url_request_context.h" |
| 73 #include "net/url_request/url_request_context_getter.h" | 73 #include "net/url_request/url_request_context_getter.h" |
| 74 #include "webkit/browser/quota/quota_manager.h" | 74 #include "webkit/browser/quota/quota_manager.h" |
| 75 #include "webkit/browser/quota/special_storage_policy.h" | 75 #include "webkit/browser/quota/special_storage_policy.h" |
| 76 #include "webkit/common/quota/quota_types.h" | 76 #include "webkit/common/quota/quota_types.h" |
| 77 | 77 |
| 78 #if defined(OS_CHROMEOS) | 78 #if defined(OS_CHROMEOS) |
| 79 #include "chrome/browser/chromeos/login/users/user.h" | |
| 80 #include "chrome/browser/chromeos/login/users/user_manager.h" | 79 #include "chrome/browser/chromeos/login/users/user_manager.h" |
| 81 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 80 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 82 #include "chromeos/attestation/attestation_constants.h" | 81 #include "chromeos/attestation/attestation_constants.h" |
| 83 #include "chromeos/dbus/cryptohome_client.h" | 82 #include "chromeos/dbus/cryptohome_client.h" |
| 84 #include "chromeos/dbus/dbus_thread_manager.h" | 83 #include "chromeos/dbus/dbus_thread_manager.h" |
| 84 #include "components/user_manager/user.h" |
| 85 #endif | 85 #endif |
| 86 | 86 |
| 87 #if defined(ENABLE_EXTENSIONS) | 87 #if defined(ENABLE_EXTENSIONS) |
| 88 #include "chrome/browser/apps/ephemeral_app_service.h" | 88 #include "chrome/browser/apps/ephemeral_app_service.h" |
| 89 #include "chrome/browser/extensions/activity_log/activity_log.h" | 89 #include "chrome/browser/extensions/activity_log/activity_log.h" |
| 90 #endif | 90 #endif |
| 91 | 91 |
| 92 #if defined(ENABLE_WEBRTC) | 92 #if defined(ENABLE_WEBRTC) |
| 93 #include "chrome/browser/media/webrtc_log_list.h" | 93 #include "chrome/browser/media/webrtc_log_list.h" |
| 94 #include "chrome/browser/media/webrtc_log_util.h" | 94 #include "chrome/browser/media/webrtc_log_util.h" |
| (...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 651 | 651 |
| 652 waiting_for_clear_content_licenses_ = true; | 652 waiting_for_clear_content_licenses_ = true; |
| 653 if (!pepper_flash_settings_manager_.get()) { | 653 if (!pepper_flash_settings_manager_.get()) { |
| 654 pepper_flash_settings_manager_.reset( | 654 pepper_flash_settings_manager_.reset( |
| 655 new PepperFlashSettingsManager(this, profile_)); | 655 new PepperFlashSettingsManager(this, profile_)); |
| 656 } | 656 } |
| 657 deauthorize_content_licenses_request_id_ = | 657 deauthorize_content_licenses_request_id_ = |
| 658 pepper_flash_settings_manager_->DeauthorizeContentLicenses(prefs); | 658 pepper_flash_settings_manager_->DeauthorizeContentLicenses(prefs); |
| 659 #if defined(OS_CHROMEOS) | 659 #if defined(OS_CHROMEOS) |
| 660 // On Chrome OS, also delete any content protection platform keys. | 660 // On Chrome OS, also delete any content protection platform keys. |
| 661 chromeos::User* user = | 661 user_manager::User* user = |
| 662 chromeos::ProfileHelper::Get()->GetUserByProfile(profile_); | 662 chromeos::ProfileHelper::Get()->GetUserByProfile(profile_); |
| 663 if (!user) { | 663 if (!user) { |
| 664 LOG(WARNING) << "Failed to find user for current profile."; | 664 LOG(WARNING) << "Failed to find user for current profile."; |
| 665 } else { | 665 } else { |
| 666 chromeos::DBusThreadManager::Get()->GetCryptohomeClient()-> | 666 chromeos::DBusThreadManager::Get()->GetCryptohomeClient()-> |
| 667 TpmAttestationDeleteKeys( | 667 TpmAttestationDeleteKeys( |
| 668 chromeos::attestation::KEY_USER, | 668 chromeos::attestation::KEY_USER, |
| 669 user->email(), | 669 user->email(), |
| 670 chromeos::attestation::kContentProtectionKeyPrefix, | 670 chromeos::attestation::kContentProtectionKeyPrefix, |
| 671 base::Bind(&BrowsingDataRemover::OnClearPlatformKeys, | 671 base::Bind(&BrowsingDataRemover::OnClearPlatformKeys, |
| (...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1172 waiting_for_clear_webrtc_logs_ = false; | 1172 waiting_for_clear_webrtc_logs_ = false; |
| 1173 NotifyAndDeleteIfDone(); | 1173 NotifyAndDeleteIfDone(); |
| 1174 } | 1174 } |
| 1175 #endif | 1175 #endif |
| 1176 | 1176 |
| 1177 void BrowsingDataRemover::OnClearedDomainReliabilityMonitor() { | 1177 void BrowsingDataRemover::OnClearedDomainReliabilityMonitor() { |
| 1178 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1178 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 1179 waiting_for_clear_domain_reliability_monitor_ = false; | 1179 waiting_for_clear_domain_reliability_monitor_ = false; |
| 1180 NotifyAndDeleteIfDone(); | 1180 NotifyAndDeleteIfDone(); |
| 1181 } | 1181 } |
| OLD | NEW |