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, 6 deletions

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..