[unified-heap] Adjust wrapper tracing and integration tests

Bug: 843903
Change-Id: I95a0caae7f528be908caff24515971b29b4f645f
Reviewed-on: https://chromium-review.googlesource.com/c/1292564Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601545}

third_party/blink/renderer/bindings/core/v8/script_wrappable_marking_visitor_test.cc

@@ -150,24 +150,6 @@ TEST(ScriptWrappableMarkingVisitorTest,
   EXPECT_TRUE(dependency_header->IsWrapperHeaderMarked());
 }
 
-TEST(ScriptWrappableMarkingVisitorTest,
-     OilpanClearsMarkingDequeWhenObjectDied) {
-  V8TestingScope scope;
-
-  DeathAwareScriptWrappable* object = DeathAwareScriptWrappable::Create();
-  InterceptingScriptWrappableMarkingVisitorScope intercepting_scope(
-      scope.GetIsolate());
-  ScriptWrappableMarkingVisitor* visitor = intercepting_scope.Visitor();
-
-  visitor->TraceWithWrappers(object);
-
-  EXPECT_EQ(visitor->MarkingDeque()->front().RawObjectPointer(), object);
-
-  PreciselyCollectGarbage();
-
-  EXPECT_EQ(visitor->MarkingDeque()->front().RawObjectPointer(), nullptr);
-}
-
 TEST(ScriptWrappableMarkingVisitorTest,
      MarkedObjectDoesNothingOnWriteBarrierHitWhenDependencyIsMarkedToo) {
   V8TestingScope scope;
@@ -448,6 +430,11 @@ TEST(ScriptWrappableMarkingVisitorTest, MixinTracing) {
 }
 
 TEST(ScriptWrappableMarkingVisitorTest, OilpanClearsHeadersWhenObjectDied) {
+  // This test depends on cleanup callbacks that are only fired when wrapper
+  // tracing is enabled.
+  if (RuntimeEnabledFeatures::HeapUnifiedGarbageCollectionEnabled())
+    return;
+
   V8TestingScope scope;
 
   DeathAwareScriptWrappable* object = DeathAwareScriptWrappable::Create();
@@ -463,4 +450,27 @@ TEST(ScriptWrappableMarkingVisitorTest, OilpanClearsHeadersWhenObjectDied) {
   EXPECT_FALSE(visitor->headers_to_unmark_.Contains(header));
 }
 
+TEST(ScriptWrappableMarkingVisitorTest,
+     OilpanClearsMarkingDequeWhenObjectDied) {
+  // This test depends on cleanup callbacks that are only fired when wrapper
+  // tracing is enabled.
+  if (RuntimeEnabledFeatures::HeapUnifiedGarbageCollectionEnabled())
+    return;
+
+  V8TestingScope scope;
+
+  DeathAwareScriptWrappable* object = DeathAwareScriptWrappable::Create();
+  InterceptingScriptWrappableMarkingVisitorScope intercepting_scope(
+      scope.GetIsolate());
+  ScriptWrappableMarkingVisitor* visitor = intercepting_scope.Visitor();
+
+  visitor->TraceWithWrappers(object);
+
+  EXPECT_EQ(visitor->MarkingDeque()->front().RawObjectPointer(), object);
+
+  PreciselyCollectGarbage();
+
+  EXPECT_EQ(visitor->MarkingDeque()->front().RawObjectPointer(), nullptr);
+}
+
 }  // namespace blink

third_party/blink/renderer/bindings/core/v8/script_wrappable_v8_gc_integration_test.cc

@@ -27,10 +27,10 @@ void RunV8MinorGC(v8::Isolate* isolate) {
       v8::Isolate::GarbageCollectionType::kMinorGarbageCollection);
 }
 
-void RunV8FullGC(v8::Isolate* isolate) {
+void RunV8FullGCWithoutScanningOilpanStack(v8::Isolate* isolate) {
   CHECK(isolate);
-  isolate->RequestGarbageCollectionForTesting(
-      v8::Isolate::GarbageCollectionType::kFullGarbageCollection);
+  V8GCController::CollectAllGarbageForTesting(
+      isolate, v8::EmbedderHeapTracer::EmbedderStackState::kEmpty);
 }
 
 }  // namespace v8_gc_integration_test
@@ -108,7 +108,7 @@ TEST(ScriptWrappableV8GCIntegrationTest,
   }
 
   v8_gc_integration_test::RunV8MinorGC(isolate);
-  v8_gc_integration_test::RunV8FullGC(isolate);
+  v8_gc_integration_test::RunV8FullGCWithoutScanningOilpanStack(isolate);
   v8_gc_integration_test::PreciselyCollectGarbage();
 
   EXPECT_FALSE(observer.WasCollected());
@@ -131,7 +131,7 @@ TEST(ScriptWrappableV8GCIntegrationTest,
   }
 
   v8_gc_integration_test::RunV8MinorGC(isolate);
-  v8_gc_integration_test::RunV8FullGC(isolate);
+  v8_gc_integration_test::RunV8FullGCWithoutScanningOilpanStack(isolate);
   v8_gc_integration_test::PreciselyCollectGarbage();
 
   EXPECT_TRUE(observer.WasCollected());