diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-28 16:14:41 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-12-13 15:19:41 +0000 |
| commit | 61d9742824d54be5693191fe502325a909feca59 (patch) | |
| tree | cbf28e779b11338fe52eb75b915684cd8955542c /chromium/media/mojo/services/mojo_cdm_service.cc | |
| parent | 45f9ded08bb7526984b24ccb5a5327aaf6821676 (diff) | |
| download | qtwebengine-chromium-61d9742824d54be5693191fe502325a909feca59.tar.gz | |
BASELINE: Update Chromium to 108.0.5359.70
Change-Id: I77334ff232b819600f275bd3cfe41fbaa3619230
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/445904
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/mojo/services/mojo_cdm_service.cc')
| -rw-r--r-- | chromium/media/mojo/services/mojo_cdm_service.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/media/mojo/services/mojo_cdm_service.cc b/chromium/media/mojo/services/mojo_cdm_service.cc index a6ae0850e87..d6d1ecb8a84 100644 --- a/chromium/media/mojo/services/mojo_cdm_service.cc +++ b/chromium/media/mojo/services/mojo_cdm_service.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,8 +9,8 @@ #include <utility> #include "base/bind.h" -#include "base/stl_util.h" #include "base/synchronization/lock.h" +#include "base/types/optional_util.h" #include "build/build_config.h" #include "media/base/cdm_config.h" #include "media/base/cdm_context.h" @@ -153,7 +153,7 @@ void MojoCdmService::OnCdmCreated( cdm_ = cdm; cdm_id_ = context_->RegisterCdm(this); DVLOG(1) << __func__ << ": CDM successfully registered with ID " - << CdmContext::CdmIdToString(base::OptionalOrNullptr(cdm_id_)); + << CdmContext::CdmIdToString(base::OptionalToPtr(cdm_id_)); auto mojo_cdm_context = mojom::CdmContext::New(); mojo_cdm_context->cdm_id = cdm_id(); |