BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 8 insertions, 7 deletions

diff --git a/chromium/ui/platform_window/fuchsia/initialize_presenter_api_view.cc b/chromium/ui/platform_window/fuchsia/initialize_presenter_api_view.cc
index 292c4ae2cca..7500fcb198e 100644
--- a/chromium/ui/platform_window/fuchsia/initialize_presenter_api_view.cc
+++ b/chromium/ui/platform_window/fuchsia/initialize_presenter_api_view.cc
@@ -5,13 +5,14 @@
 #include "ui/platform_window/fuchsia/initialize_presenter_api_view.h"
 
 #include <fuchsia/ui/policy/cpp/fidl.h>
-#include <fuchsia/ui/views/cpp/fidl.h>
 #include <lib/sys/cpp/component_context.h>
 #include <lib/ui/scenic/cpp/view_ref_pair.h>
 #include <lib/ui/scenic/cpp/view_token_pair.h>
 
-#include "base/fuchsia/default_context.h"
+#include <utility>
+
 #include "base/fuchsia/fuchsia_logging.h"
+#include "base/fuchsia/process_context.h"
 
 namespace ui {
 namespace fuchsia {
@@ -21,19 +22,19 @@ void InitializeViewTokenAndPresentView(
   DCHECK(window_properties_out);
 
   // Generate ViewToken and ViewHolderToken for the new view.
-  ::fuchsia::ui::views::ViewHolderToken view_holder_token;
-  std::tie(window_properties_out->view_token, view_holder_token) =
-      scenic::NewViewTokenPair();
+  auto view_tokens = scenic::ViewTokenPair::New();
+  window_properties_out->view_token = std::move(view_tokens.view_token);
 
   // Create a ViewRefPair so the view can be registered to the SemanticsManager.
   window_properties_out->view_ref_pair = scenic::ViewRefPair::New();
 
   // Request Presenter to show the view full-screen.
-  auto presenter = base::fuchsia::ComponentContextForCurrentProcess()
+  auto presenter = base::ComponentContextForProcess()
                        ->svc()
                        ->Connect<::fuchsia::ui::policy::Presenter>();
 
-  presenter->PresentView(std::move(view_holder_token), nullptr);
+  presenter->PresentOrReplaceView(std::move(view_tokens.view_holder_token),
+                                  nullptr);
 }
 
 }  // namespace fuchsia