heap: Disable concurrent sweeping for tests that don't support it

Bug: 967258
Change-Id: I3f7f7b7b8c75d330364f74849e22205e60c3d323
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1697605
Commit-Queue: Anton Bikineev <bikineev@chromium.org>
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676386}

third_party/blink/renderer/platform/heap/heap_test.cc

@@ -38,8 +38,10 @@
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/renderer/platform/bindings/buildflags.h"
 #include "third_party/blink/renderer/platform/heap/address_cache.h"
@@ -1872,6 +1874,11 @@ TEST(HeapTest, LazySweepingPages) {
 }
 
 TEST(HeapTest, LazySweepingLargeObjectPages) {
+  // Disable concurrent sweeping to check lazy sweeping on allocation.
+  base::test::ScopedFeatureList scoped_feature_list;
+  scoped_feature_list.InitAndDisableFeature(
+      blink::features::kBlinkHeapConcurrentSweeping);
+
   ClearOutOldGarbage();
 
   // Create free lists that can be reused for IntWrappers created in

third_party/blink/renderer/platform/heap/incremental_marking_test.cc

@@ -5,7 +5,9 @@
 #include <initializer_list>
 
 #include "base/bind.h"
+#include "base/test/scoped_feature_list.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/common/features.h"
 #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
 #include "third_party/blink/renderer/platform/heap/heap.h"
 #include "third_party/blink/renderer/platform/heap/heap_allocator.h"
@@ -1901,6 +1903,11 @@ TEST(IncrementalMarkingTest, AdjustMarkedBytesOnMarkedBackingStore) {
   // marked bytes when the page is actually about to be swept and marking is not
   // in progress.
 
+  // Disable concurrent sweeping to check that sweeping is not in progress after
+  // the FinishGC call.
+  base::test::ScopedFeatureList scoped_feature_list;
+  scoped_feature_list.InitAndDisableFeature(
+      blink::features::kBlinkHeapConcurrentSweeping);
   using Container = HeapVector<Member<Object>>;
   Persistent<Container> holder(MakeGarbageCollected<Container>());
   holder->push_back(MakeGarbageCollected<Object>());

third_party/blink/renderer/platform/lifecycle_context_test.cc

@@ -143,8 +143,10 @@ TEST(LifecycleContextTest, ObserverRemovedDuringNotifyDestroyed) {
 // This is a regression test for http://crbug.com/854639.
 TEST(LifecycleContextTest, ShouldNotHitCFICheckOnIncrementalMarking) {
   base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeature(
-      blink::features::kBlinkHeapIncrementalMarking);
+  // Disable concurrent sweeping as worker_pool task environment is not set.
+  scoped_feature_list.InitWithFeatures(
+      {blink::features::kBlinkHeapIncrementalMarking},
+      {blink::features::kBlinkHeapConcurrentSweeping});
   ThreadState* thread_state = ThreadState::Current();
   thread_state->IncrementalMarkingStart(BlinkGC::GCReason::kForcedGCForTesting);