| Index: content/browser/resource_context_impl.cc
|
| diff --git a/content/browser/resource_context_impl.cc b/content/browser/resource_context_impl.cc
|
| index 93e2890da81d964f684b88fa027a1b694723703c..a9718edb06d980fe36b493846cefa9c18e69de74 100644
|
| --- a/content/browser/resource_context_impl.cc
|
| +++ b/content/browser/resource_context_impl.cc
|
| @@ -6,11 +6,9 @@
|
|
|
| #include <stdint.h>
|
|
|
| -#include "base/base64.h"
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| #include "base/memory/ptr_util.h"
|
| -#include "base/rand_util.h"
|
| #include "content/browser/blob_storage/chrome_blob_storage_context.h"
|
| #include "content/browser/loader/resource_dispatcher_host_impl.h"
|
| #include "content/browser/loader/resource_request_info_impl.h"
|
| @@ -28,27 +26,13 @@ const char kBlobStorageContextKeyName[] = "content_blob_storage_context";
|
| const char kStreamContextKeyName[] = "content_stream_context";
|
| const char kURLDataManagerBackendKeyName[] = "url_data_manager_backend";
|
|
|
| -ResourceContext::ResourceContext()
|
| - : media_device_id_salt_(CreateRandomMediaDeviceIDSalt()) {
|
| -}
|
| +ResourceContext::ResourceContext() {}
|
|
|
| ResourceContext::~ResourceContext() {
|
| if (ResourceDispatcherHostImpl::Get())
|
| ResourceDispatcherHostImpl::Get()->CancelRequestsForContext(this);
|
| }
|
|
|
| -std::string ResourceContext::GetMediaDeviceIDSalt() {
|
| - return media_device_id_salt_;
|
| -}
|
| -
|
| -// static
|
| -std::string ResourceContext::CreateRandomMediaDeviceIDSalt() {
|
| - std::string salt;
|
| - base::Base64Encode(base::RandBytesAsString(16), &salt);
|
| - DCHECK(!salt.empty());
|
| - return salt;
|
| -}
|
| -
|
| ChromeBlobStorageContext* GetChromeBlobStorageContextForResourceContext(
|
| const ResourceContext* resource_context) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
|