Move collectGarbage* methods to ThreadState

third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/fetch/FetchBlobDataConsumerHandle.h"
 
 #include "core/dom/ExecutionContext.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "core/loader/MockThreadableLoader.h"
 #include "core/loader/ThreadableLoaderClient.h"
@@ skipping 59 matching lines @@
 }
 
 class FetchBlobDataConsumerHandleTest : public ::testing::Test {
 public:
     FetchBlobDataConsumerHandleTest()
         : m_dummyPageHolder(DummyPageHolder::create(IntSize(1, 1))) {}
     ~FetchBlobDataConsumerHandleTest() override
     {
         m_dummyPageHolder = nullptr;
         // We need this to collect garbage-collected mocks.
-        ThreadHeap::collectAllGarbage();
+        ThreadState::current()-> collectAllGarbage();
     }
 
     Document& document() { return m_dummyPageHolder->document(); }
 
 private:
     std::unique_ptr<DummyPageHolder> m_dummyPageHolder;
 };
 
 TEST_F(FetchBlobDataConsumerHandleTest, CreateLoader)
 {
@@ skipping 119 matching lines @@
 
     char buffer[1];
     size_t size = 0;
     ASSERT_EQ(kShouldWait, reader->read(buffer, sizeof(buffer), kNone, &size));
     checkpoint.Call(1);
     testing::runPendingTasks();
     checkpoint.Call(2);
     handle = nullptr;
     reader = nullptr;
     checkpoint.Call(3);
-    ThreadHeap::collectAllGarbage();
+    ThreadState::current()-> collectAllGarbage();
     checkpoint.Call(4);
 }
 
 TEST_F(FetchBlobDataConsumerHandleTest, ReadTest)
 {
     auto factory = new StrictMock<MockLoaderFactory>;
     Checkpoint checkpoint;
 
     Persistent<MockThreadableLoader> loader = MockThreadableLoader::create();
     ThreadableLoaderClient* client = nullptr;
@@ skipping 209 matching lines @@
     std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainFetchDataReader(nullptr);
 
     const void* buffer;
     size_t available;
     EXPECT_EQ(kShouldWait, reader->beginRead(&buffer, kNone, &available));
     EXPECT_FALSE(reader->drainAsBlobDataHandle());
 }
 
 } // namespace
 } // namespace blink