BASELINE: Update Chromium to 85.0.4183.14085-based

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

3 files changed, 25 insertions, 19 deletions

diff --git a/chromium/chrome/renderer/prerender/prerender_helper.cc b/chromium/chrome/renderer/prerender/prerender_helper.cc
index 2097753f052..92103602000 100644
--- a/chromium/chrome/renderer/prerender/prerender_helper.cc
+++ b/chromium/chrome/renderer/prerender/prerender_helper.cc
@@ -6,8 +6,8 @@
 
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
-#include "chrome/common/prerender_messages.h"
 #include "chrome/common/prerender_url_loader_throttle.h"
+#include "components/prerender/common/prerender_messages.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
@@ -19,14 +19,14 @@
 namespace prerender {
 
 PrerenderHelper::PrerenderHelper(content::RenderFrame* render_frame,
-                                 PrerenderMode prerender_mode,
+                                 prerender::mojom::PrerenderMode prerender_mode,
                                  const std::string& histogram_prefix)
     : content::RenderFrameObserver(render_frame),
       content::RenderFrameObserverTracker<PrerenderHelper>(render_frame),
       prerender_mode_(prerender_mode),
       histogram_prefix_(histogram_prefix),
       start_time_(base::TimeTicks::Now()) {
-  DCHECK_NE(prerender_mode_, NO_PRERENDER);
+  DCHECK_NE(prerender_mode_, prerender::mojom::PrerenderMode::kNoPrerender);
 }
 
 PrerenderHelper::~PrerenderHelper() = default;
@@ -43,7 +43,7 @@ std::unique_ptr<blink::URLLoaderThrottle> PrerenderHelper::MaybeCreateThrottle(
   if (!prerender_helper)
     return nullptr;
 
-  mojo::PendingRemote<chrome::mojom::PrerenderCanceler> canceler;
+  mojo::PendingRemote<prerender::mojom::PrerenderCanceler> canceler;
   render_frame->GetBrowserInterfaceBroker()->GetInterface(
       canceler.InitWithNewPipeAndPassReceiver());
 
@@ -56,23 +56,26 @@ std::unique_ptr<blink::URLLoaderThrottle> PrerenderHelper::MaybeCreateThrottle(
 
 // static.
 bool PrerenderHelper::IsPrerendering(const content::RenderFrame* render_frame) {
-  return PrerenderHelper::GetPrerenderMode(render_frame) != NO_PRERENDER;
+  return PrerenderHelper::GetPrerenderMode(render_frame) !=
+         prerender::mojom::PrerenderMode::kNoPrerender;
 }
 
 // static.
-PrerenderMode PrerenderHelper::GetPrerenderMode(
+prerender::mojom::PrerenderMode PrerenderHelper::GetPrerenderMode(
     const content::RenderFrame* render_frame) {
   PrerenderHelper* helper = PrerenderHelper::Get(render_frame);
   if (!helper)
-    return NO_PRERENDER;
+    return prerender::mojom::PrerenderMode::kNoPrerender;
 
-  DCHECK_NE(helper->prerender_mode_, NO_PRERENDER);
+  DCHECK_NE(helper->prerender_mode_,
+            prerender::mojom::PrerenderMode::kNoPrerender);
   return helper->prerender_mode_;
 }
 
 void PrerenderHelper::DidFinishDocumentLoad() {
-  if (prerender_mode_ != PREFETCH_ONLY)
+  if (prerender_mode_ != prerender::mojom::PrerenderMode::kPrefetchOnly)
     return;
+
   parsed_time_ = base::TimeTicks::Now();
   prefetch_finished_ = true;
   if (prefetch_count_ == 0)
@@ -93,11 +96,11 @@ void PrerenderHelper::OnDestruct() {
   delete this;
 }
 
-void PrerenderHelper::OnSetIsPrerendering(PrerenderMode mode,
+void PrerenderHelper::OnSetIsPrerendering(prerender::mojom::PrerenderMode mode,
                                           const std::string& histogram_prefix) {
   // Immediately after construction, |this| may receive the message that
   // triggered its creation.  If so, ignore it.
-  if (mode != prerender::NO_PRERENDER)
+  if (mode != prerender::mojom::PrerenderMode::kNoPrerender)
     return;
 
   std::vector<base::WeakPtr<PrerenderURLLoaderThrottle>> throttles =
@@ -120,7 +123,7 @@ void PrerenderHelper::AddThrottle(
   // sending the "prefetch finished" signal until they are destroyed. This is
   // important since that signal tells the browser that it can tear down this
   // renderer which could interrupt subresource prefetching.
-  if (prerender_mode_ == PREFETCH_ONLY) {
+  if (prerender_mode_ == prerender::mojom::PrerenderMode::kPrefetchOnly) {
     prefetch_count_++;
     throttle->set_destruction_closure(base::BindOnce(
         &PrerenderHelper::OnThrottleDestroyed, weak_factory_.GetWeakPtr()));
diff --git a/chromium/chrome/renderer/prerender/prerender_helper.h b/chromium/chrome/renderer/prerender/prerender_helper.h
index 6bd8cbca918..e479e1a82cb 100644
--- a/chromium/chrome/renderer/prerender/prerender_helper.h
+++ b/chromium/chrome/renderer/prerender/prerender_helper.h
@@ -9,7 +9,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
-#include "chrome/common/prerender_types.h"
+#include "components/prerender/common/prerender_types.mojom.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_frame_observer_tracker.h"
 
@@ -27,7 +27,7 @@ class PrerenderHelper
       public content::RenderFrameObserverTracker<PrerenderHelper> {
  public:
   PrerenderHelper(content::RenderFrame* render_frame,
-                  PrerenderMode prerender_mode,
+                  prerender::mojom::PrerenderMode prerender_mode,
                   const std::string& histogram_prefix);
 
   ~PrerenderHelper() override;
@@ -40,10 +40,12 @@ class PrerenderHelper
   // Returns true if |render_frame| is currently prerendering.
   static bool IsPrerendering(const content::RenderFrame* render_frame);
 
-  static PrerenderMode GetPrerenderMode(
+  static prerender::mojom::PrerenderMode GetPrerenderMode(
       const content::RenderFrame* render_frame);
 
-  PrerenderMode prerender_mode() const { return prerender_mode_; }
+  prerender::mojom::PrerenderMode prerender_mode() const {
+    return prerender_mode_;
+  }
   std::string histogram_prefix() const { return histogram_prefix_; }
 
  private:
@@ -52,14 +54,14 @@ class PrerenderHelper
   bool OnMessageReceived(const IPC::Message& message) override;
   void OnDestruct() override;
 
-  void OnSetIsPrerendering(PrerenderMode mode,
+  void OnSetIsPrerendering(prerender::mojom::PrerenderMode mode,
                            const std::string& histogram_prefix);
 
   void AddThrottle(const base::WeakPtr<PrerenderURLLoaderThrottle>& throttle);
   void OnThrottleDestroyed();
   void SendPrefetchFinished();
 
-  PrerenderMode prerender_mode_;
+  prerender::mojom::PrerenderMode prerender_mode_;
   std::string histogram_prefix_;
 
   // Pending requests for this frame..
diff --git a/chromium/chrome/renderer/prerender/prerenderer_client.cc b/chromium/chrome/renderer/prerender/prerenderer_client.cc
index c82d6e61174..76c809faacf 100644
--- a/chromium/chrome/renderer/prerender/prerenderer_client.cc
+++ b/chromium/chrome/renderer/prerender/prerenderer_client.cc
@@ -23,7 +23,8 @@ PrerendererClient::~PrerendererClient() = default;
 
 bool PrerendererClient::IsPrefetchOnly() {
   return PrerenderHelper::GetPrerenderMode(
-             render_view()->GetMainRenderFrame()) == PREFETCH_ONLY;
+             render_view()->GetMainRenderFrame()) ==
+         prerender::mojom::PrerenderMode::kPrefetchOnly;
 }
 
 void PrerendererClient::OnDestruct() {