BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 3 insertions, 8 deletions

diff --git a/chromium/media/base/cdm_context.h b/chromium/media/base/cdm_context.h
index e346698746e..b3a0d19c149 100644
--- a/chromium/media/base/cdm_context.h
+++ b/chromium/media/base/cdm_context.h
@@ -12,6 +12,7 @@
 #include "media/media_buildflags.h"
 
 #if defined(OS_WIN)
+#include <wrl/client.h>
 struct IMFCdmProxy;
 #endif
 
@@ -90,7 +91,8 @@ class MEDIA_EXPORT CdmContext {
   virtual int GetCdmId() const;
 
 #if defined(OS_WIN)
-  using GetMediaFoundationCdmProxyCB = base::OnceCallback<void(IMFCdmProxy*)>;
+  using GetMediaFoundationCdmProxyCB =
+      base::OnceCallback<void(Microsoft::WRL::ComPtr<IMFCdmProxy>)>;
   // This allows a CdmContext to expose an IMFTrustedInput instance for use in
   // a Media Foundation rendering pipeline. This method is asynchronous because
   // the underlying MF-based CDM might not have a native session created yet.
@@ -120,13 +122,6 @@ class MEDIA_EXPORT CdmContext {
   DISALLOW_COPY_AND_ASSIGN(CdmContext);
 };
 
-// Callback to notify that the CdmContext has been completely attached to
-// the media pipeline. Parameter indicates whether the operation succeeded.
-typedef base::OnceCallback<void(bool)> CdmAttachedCB;
-
-// A dummy implementation of CdmAttachedCB.
-MEDIA_EXPORT void IgnoreCdmAttached(bool success);
-
 // A reference holder to make sure the CdmContext is always valid as long as
 // |this| is alive. Typically |this| will hold a reference (directly or
 // indirectly) to the host, e.g. a ContentDecryptionModule.