Make default media device ID salts random by default

blimp/engine/common/blimp_browser_context.cc

 // Copyright 2015 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 "blimp/engine/common/blimp_browser_context.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/nix/xdg_util.h"
 #include "base/path_service.h"
 #include "blimp/engine/app/blimp_permission_manager.h"
 #include "components/metrics/metrics_service.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/in_memory_pref_store.h"
@@ skipping 10 matching lines @@
 // store only.
 void IgnoreReadError(PersistentPrefStore::PrefReadError error) {}
 }  // namespace
 
 namespace blimp {
 namespace engine {
 
 // Contains URLRequestContextGetter required for resource loading.
 class BlimpResourceContext : public content::ResourceContext {
  public:
-  BlimpResourceContext() {}
+  BlimpResourceContext()
+      : media_device_id_salt_(CreateRandomMediaDeviceIDSalt()) {}
   ~BlimpResourceContext() override {}
 
   void set_url_request_context_getter(
       const scoped_refptr<BlimpURLRequestContextGetter>& getter) {
     getter_ = getter;
   }
 
   const scoped_refptr<BlimpURLRequestContextGetter>&
   url_request_context_getter() {
     return getter_;
   }
 
   // content::ResourceContext implementation.
   net::HostResolver* GetHostResolver() override;
   net::URLRequestContext* GetRequestContext() override;
+  SaltCallback GetMediaDeviceIDSalt() override;
 
  private:
   scoped_refptr<BlimpURLRequestContextGetter> getter_;
+  std::string media_device_id_salt_;

[tommi (sloooow) - chröme, 2016/05/17 12:27:20]

const?

[Guido Urdaneta, 2016/05/18 09:40:19]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(BlimpResourceContext);
 };
 
 net::HostResolver* BlimpResourceContext::GetHostResolver() {
   return getter_->host_resolver();
 }
 
 net::URLRequestContext* BlimpResourceContext::GetRequestContext() {
   return getter_->GetURLRequestContext();
 }
 
+content::ResourceContext::SaltCallback
+BlimpResourceContext::GetMediaDeviceIDSalt() {
+  return CreateSaltCallback(media_device_id_salt_);
+}
+
 BlimpBrowserContext::BlimpBrowserContext(bool off_the_record,
                                          net::NetLog* net_log)
     : resource_context_(new BlimpResourceContext),
       ignore_certificate_errors_(false),
       off_the_record_(off_the_record),
       net_log_(net_log) {
   InitWhileIOAllowed();
   InitPrefService();
   metrics_service_client_.reset(
       new BlimpMetricsServiceClient(pref_service_.get(),
@@ skipping 123 matching lines @@
 
 net::URLRequestContextGetter*
 BlimpBrowserContext::CreateMediaRequestContextForStoragePartition(
     const base::FilePath& partition_path,
     bool in_memory) {
   return nullptr;
 }
 
 }  // namespace engine
 }  // namespace blimp