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

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

Issue 1981913002: *DRAFT* Move MediaDeviceIDSalt from chrome/ to components/ and use it in Android WebView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months 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
« no previous file with comments | « chrome/browser/media/media_device_id_salt.h ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
deleted file mode 100644
index 2220418e031c0f21a713d886d5eacaaa2903f2f9..0000000000000000000000000000000000000000
--- a/chrome/browser/media/media_device_id_salt.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-// 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/base64.h"
-#include "base/rand_util.h"
-#include "chrome/browser/profiles/profile_io_data.h"
-#include "chrome/common/pref_names.h"
-#include "components/prefs/pref_service.h"
-#include "content/public/browser/browser_thread.h"
-
-using content::BrowserThread;
-
-namespace {
-
-std::string CreateSalt() {
- std::string salt;
- base::Base64Encode(base::RandBytesAsString(16), &salt);
- DCHECK(!salt.empty());
- return salt;
-}
-
-} // namespace
-
-MediaDeviceIDSalt::MediaDeviceIDSalt(PrefService* pref_service,
- bool incognito) {
- DCHECK_CURRENTLY_ON(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() {
-}
-
-void MediaDeviceIDSalt::ShutdownOnUIThread() {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
- if (incognito_salt_.empty())
- media_device_id_salt_.Destroy();
-}
-
-std::string MediaDeviceIDSalt::GetSalt() const {
- DCHECK_CURRENTLY_ON(BrowserThread::IO);
- if (incognito_salt_.size())
- return incognito_salt_;
- return media_device_id_salt_.GetValue();
-}
-
-void MediaDeviceIDSalt::RegisterProfilePrefs(
- user_prefs::PrefRegistrySyncable* registry) {
- registry->RegisterStringPref(prefs::kMediaDeviceIdSalt, std::string());
-}
-
-void MediaDeviceIDSalt::Reset(PrefService* pref_service) {
- pref_service->SetString(prefs::kMediaDeviceIdSalt,
- CreateSalt());
-}
« no previous file with comments | « chrome/browser/media/media_device_id_salt.h ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698