| Index: content/browser/storage_partition_impl.cc
|
| diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
|
| index 14cd612065d8aa1945e4463a2b26235069cf2c40..72ff95b96a25c2ba7612034ccbf6e3e9c39caf34 100644
|
| --- a/content/browser/storage_partition_impl.cc
|
| +++ b/content/browser/storage_partition_impl.cc
|
| @@ -314,7 +314,6 @@ struct StoragePartitionImpl::DataDeletionHelper {
|
| DOMStorageContextWrapper* dom_storage_context,
|
| storage::QuotaManager* quota_manager,
|
| storage::SpecialStoragePolicy* special_storage_policy,
|
| - WebRTCIdentityStore* webrtc_identity_store,
|
| const base::Time begin,
|
| const base::Time end);
|
|
|
| @@ -366,7 +365,6 @@ StoragePartitionImpl::StoragePartitionImpl(
|
| IndexedDBContextImpl* indexed_db_context,
|
| CacheStorageContextImpl* cache_storage_context,
|
| ServiceWorkerContextWrapper* service_worker_context,
|
| - WebRTCIdentityStore* webrtc_identity_store,
|
| storage::SpecialStoragePolicy* special_storage_policy,
|
| HostZoomLevelContext* host_zoom_level_context,
|
| PlatformNotificationContextImpl* platform_notification_context,
|
| @@ -380,7 +378,6 @@ StoragePartitionImpl::StoragePartitionImpl(
|
| indexed_db_context_(indexed_db_context),
|
| cache_storage_context_(cache_storage_context),
|
| service_worker_context_(service_worker_context),
|
| - webrtc_identity_store_(webrtc_identity_store),
|
| special_storage_policy_(special_storage_policy),
|
| host_zoom_level_context_(host_zoom_level_context),
|
| platform_notification_context_(platform_notification_context),
|
| @@ -493,9 +490,6 @@ StoragePartitionImpl* StoragePartitionImpl::Create(
|
| scoped_refptr<ChromeAppCacheService> appcache_service =
|
| new ChromeAppCacheService(quota_manager->proxy());
|
|
|
| - scoped_refptr<WebRTCIdentityStore> webrtc_identity_store(
|
| - new WebRTCIdentityStore(path, context->GetSpecialStoragePolicy()));
|
| -
|
| scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy(
|
| context->GetSpecialStoragePolicy());
|
|
|
| @@ -517,9 +511,8 @@ StoragePartitionImpl* StoragePartitionImpl::Create(
|
| filesystem_context.get(), database_tracker.get(),
|
| dom_storage_context.get(), indexed_db_context.get(),
|
| cache_storage_context.get(), service_worker_context.get(),
|
| - webrtc_identity_store.get(), special_storage_policy.get(),
|
| - host_zoom_level_context.get(), platform_notification_context.get(),
|
| - background_sync_context.get());
|
| + special_storage_policy.get(), host_zoom_level_context.get(),
|
| + platform_notification_context.get(), background_sync_context.get());
|
|
|
| service_worker_context->set_storage_partition(storage_partition);
|
|
|
| @@ -621,7 +614,7 @@ void StoragePartitionImpl::ClearDataImpl(
|
| helper->ClearDataOnUIThread(
|
| storage_origin, origin_matcher, cookie_matcher, GetPath(), rq_context,
|
| dom_storage_context_.get(), quota_manager_.get(),
|
| - special_storage_policy_.get(), webrtc_identity_store_.get(), begin, end);
|
| + special_storage_policy_.get(), begin, end);
|
| }
|
|
|
| void StoragePartitionImpl::
|
| @@ -760,7 +753,6 @@ void StoragePartitionImpl::DataDeletionHelper::ClearDataOnUIThread(
|
| DOMStorageContextWrapper* dom_storage_context,
|
| storage::QuotaManager* quota_manager,
|
| storage::SpecialStoragePolicy* special_storage_policy,
|
| - WebRTCIdentityStore* webrtc_identity_store,
|
| const base::Time begin,
|
| const base::Time end) {
|
| DCHECK_NE(remove_mask, 0u);
|
| @@ -829,18 +821,6 @@ void StoragePartitionImpl::DataDeletionHelper::ClearDataOnUIThread(
|
| path, begin, end, decrement_callback));
|
| }
|
|
|
| - if (remove_mask & REMOVE_DATA_MASK_WEBRTC_IDENTITY) {
|
| - IncrementTaskCountOnUI();
|
| - BrowserThread::PostTask(
|
| - BrowserThread::IO,
|
| - FROM_HERE,
|
| - base::Bind(&WebRTCIdentityStore::DeleteBetween,
|
| - webrtc_identity_store,
|
| - begin,
|
| - end,
|
| - decrement_callback));
|
| - }
|
| -
|
| DecrementTaskCountOnUI();
|
| }
|
|
|
| @@ -888,10 +868,6 @@ void StoragePartitionImpl::Flush() {
|
| GetDOMStorageContext()->Flush();
|
| }
|
|
|
| -WebRTCIdentityStore* StoragePartitionImpl::GetWebRTCIdentityStore() {
|
| - return webrtc_identity_store_.get();
|
| -}
|
| -
|
| BrowserContext* StoragePartitionImpl::browser_context() const {
|
| return browser_context_;
|
| }
|
|
|