Index: content/browser/storage_partition_impl.cc |
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc |
index 1ef698f0f868812a0662a951ff74e4bc7b75b1a5..da339fead254c8c3c96fb58494a65231ab66b343 100644 |
--- a/content/browser/storage_partition_impl.cc |
+++ b/content/browser/storage_partition_impl.cc |
@@ -318,7 +318,6 @@ struct StoragePartitionImpl::DataDeletionHelper { |
DOMStorageContextWrapper* dom_storage_context, |
storage::QuotaManager* quota_manager, |
storage::SpecialStoragePolicy* special_storage_policy, |
- WebRTCIdentityStore* webrtc_identity_store, |
storage::FileSystemContext* filesystem_context, |
const base::Time begin, |
const base::Time end); |
@@ -371,7 +370,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, |
@@ -387,7 +385,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), |
@@ -500,9 +497,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()); |
@@ -527,9 +521,9 @@ 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(), std::move(broadcast_channel_provider)); |
+ special_storage_policy.get(), host_zoom_level_context.get(), |
+ platform_notification_context.get(), background_sync_context.get(), |
+ std::move(broadcast_channel_provider)); |
service_worker_context->set_storage_partition(storage_partition); |
@@ -636,8 +630,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(), |
- filesystem_context_.get(), begin, end); |
+ special_storage_policy_.get(), filesystem_context_.get(), begin, end); |
} |
void StoragePartitionImpl:: |
@@ -776,7 +769,6 @@ void StoragePartitionImpl::DataDeletionHelper::ClearDataOnUIThread( |
DOMStorageContextWrapper* dom_storage_context, |
storage::QuotaManager* quota_manager, |
storage::SpecialStoragePolicy* special_storage_policy, |
- WebRTCIdentityStore* webrtc_identity_store, |
storage::FileSystemContext* filesystem_context, |
const base::Time begin, |
const base::Time end) { |
@@ -846,18 +838,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)); |
- } |
- |
#if defined(ENABLE_PLUGINS) |
if (remove_mask & REMOVE_DATA_MASK_PLUGIN_PRIVATE_DATA) { |
IncrementTaskCountOnUI(); |
@@ -915,10 +895,6 @@ void StoragePartitionImpl::Flush() { |
GetDOMStorageContext()->Flush(); |
} |
-WebRTCIdentityStore* StoragePartitionImpl::GetWebRTCIdentityStore() { |
- return webrtc_identity_store_.get(); |
-} |
- |
BrowserContext* StoragePartitionImpl::browser_context() const { |
return browser_context_; |
} |