Chromium Code Reviews| Index: blimp/engine/common/blimp_browser_context.cc |
| diff --git a/blimp/engine/common/blimp_browser_context.cc b/blimp/engine/common/blimp_browser_context.cc |
| index 9c86399cb577949889bed1405a2e8c68edd37ecc..40ff7f70fbcb535e4965a8320b6377411898afdc 100644 |
| --- a/blimp/engine/common/blimp_browser_context.cc |
| +++ b/blimp/engine/common/blimp_browser_context.cc |
| @@ -4,6 +4,8 @@ |
| #include "blimp/engine/common/blimp_browser_context.h" |
| +#include <string> |
| + |
| #include "base/bind.h" |
| #include "base/environment.h" |
| #include "base/files/file_util.h" |
| @@ -34,7 +36,8 @@ 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( |
| @@ -50,9 +53,11 @@ class BlimpResourceContext : public content::ResourceContext { |
| // 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); |
| }; |
| @@ -65,6 +70,11 @@ 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), |