diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/cdm | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-c30a6232df03e1efbd9f3b226777b07e087a1122.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/cdm')
| -rw-r--r-- | chromium/components/cdm/browser/BUILD.gn | 1 | ||||
| -rw-r--r-- | chromium/components/cdm/browser/media_drm_storage_impl.cc | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chromium/components/cdm/browser/BUILD.gn b/chromium/components/cdm/browser/BUILD.gn index af49e121d43..f85eaad72fb 100644 --- a/chromium/components/cdm/browser/BUILD.gn +++ b/chromium/components/cdm/browser/BUILD.gn @@ -12,6 +12,7 @@ jumbo_source_set("browser") { public_deps = [ "//base", + "//base/util/values:values_util", "//content/public/browser", "//media/mojo/mojom", "//url", diff --git a/chromium/components/cdm/browser/media_drm_storage_impl.cc b/chromium/components/cdm/browser/media_drm_storage_impl.cc index 22f0587509f..cb8b09a95a8 100644 --- a/chromium/components/cdm/browser/media_drm_storage_impl.cc +++ b/chromium/components/cdm/browser/media_drm_storage_impl.cc @@ -14,7 +14,7 @@ #include "base/no_destructor.h" #include "base/optional.h" #include "base/strings/string_util.h" -#include "base/value_conversions.h" +#include "base/util/values/values_util.h" #include "build/build_config.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" @@ -147,7 +147,7 @@ class OriginData { base::Value ToDictValue() const { base::Value dict(base::Value::Type::DICTIONARY); - dict.SetKey(kOriginId, base::CreateUnguessableTokenValue(origin_id_)); + dict.SetKey(kOriginId, util::UnguessableTokenToValue(origin_id_)); dict.SetKey(kCreationTime, base::Value(provision_time_.ToDoubleT())); return dict; @@ -165,15 +165,16 @@ class OriginData { if (!origin_id_value) return nullptr; - base::UnguessableToken origin_id; - if (!base::GetValueAsUnguessableToken(*origin_id_value, &origin_id)) + base::Optional<base::UnguessableToken> origin_id = + util::ValueToUnguessableToken(*origin_id_value); + if (!origin_id) return nullptr; base::Time time; if (!GetCreationTimeFromDict(origin_dict, &time)) return nullptr; - return base::WrapUnique(new OriginData(origin_id, time)); + return base::WrapUnique(new OriginData(*origin_id, time)); } private: |