Commit ea8bcd05 authored by Christian Dullweber's avatar Christian Dullweber Committed by Commit Bot

Add MediaLicenses to site data deletion on Android

MediaLicenses are deleted together with Cookies in Clear Browsing
Data (basic tab) now. We should also delete them from SiteDetails.

Bug: 877999
Change-Id: Id4c751ca797ef6b3d123870cceb9eb1eef62e5f8
Reviewed-on: https://chromium-review.googlesource.com/1213242Reviewed-by: default avatarTheresa <twellington@chromium.org>
Reviewed-by: default avatarXiaohan Wang <xhwang@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589937}
parent a9126be0
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "chrome/browser/android/search_permissions/search_permissions_service.h" #include "chrome/browser/android/search_permissions/search_permissions_service.h"
#include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h" #include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h"
#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
#include "chrome/browser/browsing_data/browsing_data_media_license_helper.h"
#include "chrome/browser/browsing_data/browsing_data_quota_helper.h" #include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
#include "chrome/browser/browsing_data/cookies_tree_model.h" #include "chrome/browser/browsing_data/cookies_tree_model.h"
#include "chrome/browser/browsing_data/local_data_container.h" #include "chrome/browser/browsing_data/local_data_container.h"
...@@ -614,7 +615,8 @@ class SiteDataDeleteHelper : public CookiesTreeModel::Observer { ...@@ -614,7 +615,8 @@ class SiteDataDeleteHelper : public CookiesTreeModel::Observer {
auto container = std::make_unique<LocalDataContainer>( auto container = std::make_unique<LocalDataContainer>(
new BrowsingDataCookieHelper(storage_partition), new BrowsingDataCookieHelper(storage_partition),
new BrowsingDataDatabaseHelper(profile_), new BrowsingDataDatabaseHelper(profile_),
new BrowsingDataLocalStorageHelper(profile_), nullptr, new BrowsingDataLocalStorageHelper(profile_),
nullptr /* session_storage_helper */,
new BrowsingDataAppCacheHelper(profile_), new BrowsingDataAppCacheHelper(profile_),
new BrowsingDataIndexedDBHelper(indexed_db_context), new BrowsingDataIndexedDBHelper(indexed_db_context),
BrowsingDataFileSystemHelper::Create(file_system_context), BrowsingDataFileSystemHelper::Create(file_system_context),
...@@ -623,8 +625,9 @@ class SiteDataDeleteHelper : public CookiesTreeModel::Observer { ...@@ -623,8 +625,9 @@ class SiteDataDeleteHelper : public CookiesTreeModel::Observer {
new BrowsingDataServiceWorkerHelper(service_worker_context), new BrowsingDataServiceWorkerHelper(service_worker_context),
new BrowsingDataSharedWorkerHelper(storage_partition, new BrowsingDataSharedWorkerHelper(storage_partition,
profile_->GetResourceContext()), profile_->GetResourceContext()),
new BrowsingDataCacheStorageHelper(cache_storage_context), nullptr, new BrowsingDataCacheStorageHelper(cache_storage_context),
nullptr); nullptr /* flash_data_helper */,
BrowsingDataMediaLicenseHelper::Create(file_system_context));
cookies_tree_model_ = std::make_unique<CookiesTreeModel>( cookies_tree_model_ = std::make_unique<CookiesTreeModel>(
std::move(container), profile_->GetExtensionSpecialStoragePolicy()); std::move(container), profile_->GetExtensionSpecialStoragePolicy());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment