BASELINE: Update Chromium to 85.0.4183.14085-based

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

2 files changed, 9 insertions, 1 deletions

diff --git a/chromium/third_party/webrtc/api/stats/rtc_stats.h b/chromium/third_party/webrtc/api/stats/rtc_stats.h
index d45902e0a5c..5de5b7fbb04 100644
--- a/chromium/third_party/webrtc/api/stats/rtc_stats.h
+++ b/chromium/third_party/webrtc/api/stats/rtc_stats.h
@@ -319,6 +319,14 @@ class RTCStatsMember : public RTCStatsMemberInterface {
   std::string ValueToString() const override;
   std::string ValueToJson() const override;
 
+  template <typename U>
+  inline T ValueOrDefault(U default_value) const {
+    if (is_defined()) {
+      return *(*this);
+    }
+    return default_value;
+  }
+
   // Assignment operators.
   T& operator=(const T& value) {
     value_ = value;
diff --git a/chromium/third_party/webrtc/api/stats/rtcstats_objects.h b/chromium/third_party/webrtc/api/stats/rtcstats_objects.h
index 28d841db09b..3458d6fef7c 100644
--- a/chromium/third_party/webrtc/api/stats/rtcstats_objects.h
+++ b/chromium/third_party/webrtc/api/stats/rtcstats_objects.h
@@ -134,7 +134,7 @@ class RTC_EXPORT RTCDataChannelStats final : public RTCStats {
 
   RTCStatsMember<std::string> label;
   RTCStatsMember<std::string> protocol;
-  RTCStatsMember<int32_t> datachannelid;
+  RTCStatsMember<int32_t> data_channel_identifier;
   // TODO(hbos): Support enum types? "RTCStatsMember<RTCDataChannelState>"?
   RTCStatsMember<std::string> state;
   RTCStatsMember<uint32_t> messages_sent;