Deprecate HeapMojoWrapperMode::kWithoutContextObserver for PrerenderHandle.

The HeapMojoWrapperMode::kWithoutContextObserver was a HeapMojoWrapper's "safe mofe" to keep the existing behavior during the release freeze.

Bug: 1049056
Change-Id: I2d7f58a6018917c399ee36cbda1483025dd64431
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2291815Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Tal Pressman <talp@chromium.org>
Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Reviewed-by: Kouhei Ueno <kouhei@chromium.org>
Commit-Queue: Minoru Chikamune <chikamune@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788465}

third_party/blink/renderer/core/exported/prerendering_test.cc

@@ -317,7 +317,7 @@ TEST_F(PrerenderingTest, AbandonPrerender) {
 
   EXPECT_EQ(1u, PrerenderProcessor()->AddCount());
   EXPECT_EQ(0u, prerender->CancelCount());
-  EXPECT_EQ(1u, prerender->AbandonCount());
+  EXPECT_EQ(0u, prerender->AbandonCount());
 
   // Check that the prerender does not emit an extra cancel when
   // garbage-collecting everything.
@@ -325,7 +325,7 @@ TEST_F(PrerenderingTest, AbandonPrerender) {
 
   EXPECT_EQ(1u, PrerenderProcessor()->AddCount());
   EXPECT_EQ(0u, prerender->CancelCount());
-  EXPECT_EQ(1u, prerender->AbandonCount());
+  EXPECT_EQ(0u, prerender->AbandonCount());
 }
 
 TEST_F(PrerenderingTest, TwoPrerenders) {
@@ -384,7 +384,7 @@ TEST_F(PrerenderingTest, TwoPrerendersRemovingFirstThenNavigating) {
   EXPECT_EQ(1u, first_prerender->CancelCount());
   EXPECT_EQ(0u, first_prerender->AbandonCount());
   EXPECT_EQ(0u, second_prerender->CancelCount());
-  EXPECT_EQ(1u, second_prerender->AbandonCount());
+  EXPECT_EQ(0u, second_prerender->AbandonCount());
 }
 
 TEST_F(PrerenderingTest, TwoPrerendersAddingThird) {

third_party/blink/renderer/core/loader/private/prerender_handle.cc

@@ -74,9 +74,7 @@ PrerenderHandle* PrerenderHandle::Create(Document& document,
       prerender_handle_client;
   auto receiver = prerender_handle_client.InitWithNewPipeAndPassReceiver();
 
-  HeapMojoRemote<mojom::blink::PrerenderHandle,
-                 HeapMojoWrapperMode::kForceWithoutContextObserver>
-      remote_handle(context);
+  HeapMojoRemote<mojom::blink::PrerenderHandle> remote_handle(context);
   prerender_processor->AddPrerender(
       std::move(attributes), std::move(prerender_handle_client),
       remote_handle.BindNewPipeAndPassReceiver(
@@ -92,9 +90,7 @@ PrerenderHandle::PrerenderHandle(
     ExecutionContext* context,
     PrerenderClient* client,
     const KURL& url,
-    HeapMojoRemote<mojom::blink::PrerenderHandle,
-                   HeapMojoWrapperMode::kForceWithoutContextObserver>
-        remote_handle,
+    HeapMojoRemote<mojom::blink::PrerenderHandle> remote_handle,
     mojo::PendingReceiver<mojom::blink::PrerenderHandleClient> receiver)
     : ExecutionContextLifecycleObserver(context),
       url_(url),

third_party/blink/renderer/core/loader/private/prerender_handle.h

@@ -39,7 +39,6 @@
 #include "third_party/blink/renderer/platform/heap/handle.h"
 #include "third_party/blink/renderer/platform/mojo/heap_mojo_receiver.h"
 #include "third_party/blink/renderer/platform/mojo/heap_mojo_remote.h"
-#include "third_party/blink/renderer/platform/mojo/heap_mojo_wrapper_mode.h"
 #include "third_party/blink/renderer/platform/weborigin/kurl.h"
 
 namespace blink {
@@ -61,14 +60,12 @@ class PrerenderHandle final : public GarbageCollected<PrerenderHandle>,
                                  unsigned prerender_rel_types);
 
   using PassKey = util::PassKey<PrerenderHandle>;
-  PrerenderHandle(
-      PassKey,
-      ExecutionContext*,
-      PrerenderClient*,
-      const KURL&,
-      HeapMojoRemote<mojom::blink::PrerenderHandle,
-                     HeapMojoWrapperMode::kForceWithoutContextObserver>,
-      mojo::PendingReceiver<mojom::blink::PrerenderHandleClient>);
+  PrerenderHandle(PassKey,
+                  ExecutionContext*,
+                  PrerenderClient*,
+                  const KURL&,
+                  HeapMojoRemote<mojom::blink::PrerenderHandle>,
+                  mojo::PendingReceiver<mojom::blink::PrerenderHandleClient>);
   ~PrerenderHandle() override;
   void Dispose();
 
@@ -91,12 +88,8 @@ class PrerenderHandle final : public GarbageCollected<PrerenderHandle>,
 
   KURL url_;
   WeakMember<PrerenderClient> client_;
-  HeapMojoRemote<mojom::blink::PrerenderHandle,
-                 HeapMojoWrapperMode::kForceWithoutContextObserver>
-      remote_handle_;
-  HeapMojoReceiver<mojom::blink::PrerenderHandleClient,
-                   PrerenderHandle,
-                   HeapMojoWrapperMode::kForceWithoutContextObserver>
+  HeapMojoRemote<mojom::blink::PrerenderHandle> remote_handle_;
+  HeapMojoReceiver<mojom::blink::PrerenderHandleClient, PrerenderHandle>
       receiver_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderHandle);