summaryrefslogtreecommitdiff
path: root/chromium/content/browser/media/webrtc_identity_store_backend.h
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-03-18 13:16:26 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-20 15:55:39 +0100
commit3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch)
tree92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/content/browser/media/webrtc_identity_store_backend.h
parente90d7c4b152c56919d963987e2503f9909a666d2 (diff)
downloadqtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/browser/media/webrtc_identity_store_backend.h')
-rw-r--r--chromium/content/browser/media/webrtc_identity_store_backend.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/chromium/content/browser/media/webrtc_identity_store_backend.h b/chromium/content/browser/media/webrtc_identity_store_backend.h
index e660c732cda..9be3fc2345e 100644
--- a/chromium/content/browser/media/webrtc_identity_store_backend.h
+++ b/chromium/content/browser/media/webrtc_identity_store_backend.h
@@ -34,9 +34,11 @@ class WebRTCIdentityStoreBackend
const std::string& private_key)>
FindIdentityCallback;
- // No data is saved on disk if |path| is empty.
+ // No data is saved on disk if |path| is empty. Identites older than
+ // |validity_period| will be removed lazily.
WebRTCIdentityStoreBackend(const base::FilePath& path,
- quota::SpecialStoragePolicy* policy);
+ quota::SpecialStoragePolicy* policy,
+ base::TimeDelta validity_period);
// Finds the identity with |origin|, |identity_name|, and |common_name| from
// the DB.
@@ -76,6 +78,10 @@ class WebRTCIdentityStoreBackend
base::Time delete_end,
const base::Closure& callback);
+ // Changes the validity period. Should be called before the database is
+ // loaded into memory.
+ void SetValidityPeriodForTesting(base::TimeDelta validity_period);
+
private:
friend class base::RefCountedThreadSafe<WebRTCIdentityStoreBackend>;
class SqlLiteStorage;
@@ -131,6 +137,9 @@ class WebRTCIdentityStoreBackend
void OnLoaded(scoped_ptr<IdentityMap> out_map);
+
+ // Identities expires after |validity_period_|.
+ base::TimeDelta validity_period_;
// In-memory copy of the identities.
IdentityMap identities_;
// "Find identity" requests waiting for the DB to load.