BASELINE: Update Chromium to 85.0.4183.14085-based

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

3 files changed, 41 insertions, 0 deletions

diff --git a/chromium/fuchsia/engine/common/cast_streaming.cc b/chromium/fuchsia/engine/common/cast_streaming.cc
new file mode 100644
index 00000000000..a224697fce3
--- /dev/null
+++ b/chromium/fuchsia/engine/common/cast_streaming.cc
@@ -0,0 +1,24 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "fuchsia/engine/common/cast_streaming.h"
+
+#include "base/command_line.h"
+#include "fuchsia/engine/switches.h"
+#include "url/gurl.h"
+
+namespace {
+constexpr char kCastStreamingReceiverUrl[] = "data:cast_streaming_receiver";
+}  // namespace
+
+bool IsCastStreamingEnabled() {
+  static bool is_cast_streaming_enabled =
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableCastStreamingReceiver);
+  return is_cast_streaming_enabled;
+}
+
+bool IsCastStreamingMediaSourceUrl(const GURL& url) {
+  return url == kCastStreamingReceiverUrl;
+}
diff --git a/chromium/fuchsia/engine/common/cast_streaming.h b/chromium/fuchsia/engine/common/cast_streaming.h
new file mode 100644
index 00000000000..660c4b538ea
--- /dev/null
+++ b/chromium/fuchsia/engine/common/cast_streaming.h
@@ -0,0 +1,16 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FUCHSIA_ENGINE_COMMON_CAST_STREAMING_H_
+#define FUCHSIA_ENGINE_COMMON_CAST_STREAMING_H_
+
+class GURL;
+
+// Returns true if Cast Streaming is enabled for this process.
+bool IsCastStreamingEnabled();
+
+// Returns true if |url| is the Cast Streaming media source URL.
+bool IsCastStreamingMediaSourceUrl(const GURL& url);
+
+#endif  // FUCHSIA_ENGINE_COMMON_CAST_STREAMING_H_
diff --git a/chromium/fuchsia/engine/common/web_engine_content_client.cc b/chromium/fuchsia/engine/common/web_engine_content_client.cc
index 24c9a741950..30d007dfe4c 100644
--- a/chromium/fuchsia/engine/common/web_engine_content_client.cc
+++ b/chromium/fuchsia/engine/common/web_engine_content_client.cc
@@ -5,6 +5,7 @@
 #include "fuchsia/engine/common/web_engine_content_client.h"
 
 #include "base/command_line.h"
+#include "base/notreached.h"
 #include "fuchsia/base/fuchsia_dir_scheme.h"
 #include "fuchsia/engine/switches.h"
 #include "ui/base/l10n/l10n_util.h"