Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Unified Diff: chrome/browser/media/media_device_id_salt.cc

Issue 54863002: Implement a salt for MediaSource IDs that can be cleared by a user. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed more comments. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/media_device_id_salt.cc
diff --git a/chrome/browser/media/media_device_id_salt.cc b/chrome/browser/media/media_device_id_salt.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a5bceb75d0fa9a4599a2e87e119f79ab6806ecf2
--- /dev/null
+++ b/chrome/browser/media/media_device_id_salt.cc
@@ -0,0 +1,62 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#include "chrome/browser/media/media_device_id_salt.h"
+
+#include "base/guid.h"
+#include "base/prefs/pref_service.h"
+#include "chrome/browser/profiles/profile_io_data.h"
+#include "chrome/common/pref_names.h"
+#include "content/public/browser/browser_thread.h"
+
+using content::BrowserThread;
+
+namespace {
+
+std::string CreateSalt() {
+ return base::GenerateGUID();
+}
+
+} // namespace
+
+MediaDeviceIDSalt::MediaDeviceIDSalt(PrefService* pref_service,
+ bool incognito) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+ if (incognito) {
+ incognito_salt_ = CreateSalt();
+ return;
+ }
+
+ media_device_id_salt_.Init(prefs::kMediaDeviceIdSalt, pref_service);
+ if (media_device_id_salt_.GetValue().empty())
+ media_device_id_salt_.SetValue(CreateSalt());
+
+ media_device_id_salt_.MoveToThread(
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
+}
+
+MediaDeviceIDSalt::~MediaDeviceIDSalt() {
+}
+
+std::string MediaDeviceIDSalt::GetSalt() const {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ if (incognito_salt_.size())
+ return incognito_salt_;
+ return media_device_id_salt_.GetValue();
+}
+
+void MediaDeviceIDSalt::RegisterProfilePrefs(
+ user_prefs::PrefRegistrySyncable* registry) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ registry->RegisterStringPref(
+ prefs::kMediaDeviceIdSalt,
+ std::string(),
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+}
+
+void MediaDeviceIDSalt::Reset(PrefService* pref_service) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ pref_service->SetString(prefs::kMediaDeviceIdSalt,
+ CreateSalt());
+}

Powered by Google App Engine
This is Rietveld 408576698