Revert of Move collectGarbage* methods to ThreadState

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

 // Copyright 2016 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/BytesConsumerForDataConsumerHandle.h"
 
 #include "modules/fetch/BytesConsumer.h"
 #include "modules/fetch/DataConsumerHandleTestUtil.h"
 #include "modules/fetch/DataConsumerHandleUtil.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
 namespace {
 
 using Command = DataConsumerHandleTestUtil::Command;
 using Checkpoint = ::testing::StrictMock<::testing::MockFunction<void(int)>>;
 using ReplayingHandle = DataConsumerHandleTestUtil::ReplayingHandle;
 using Result = BytesConsumer::Result;
 using ::testing::InSequence;
 using ::testing::Return;
 
 class BytesConsumerForDataConsumerHandleTest : public ::testing::Test {
 protected:
     ~BytesConsumerForDataConsumerHandleTest()
     {
-        ThreadState::current()-> collectAllGarbage();
+        ThreadHeap::collectAllGarbage();
     }
 };
 
 class MockClient : public GarbageCollectedFinalized<MockClient>, public BytesConsumer::Client {
     USING_GARBAGE_COLLECTED_MIXIN(MockClient);
 public:
     static MockClient* create() { return new ::testing::StrictMock<MockClient>(); }
     MOCK_METHOD0(onStateChange, void());
 
 protected:
@@ skipping 298 matching lines @@
 
     Checkpoint checkpoint;
     InSequence s;
     EXPECT_CALL(*proxy, drainAsFormData()).WillOnce(Return(formData));
 
     EXPECT_EQ(formData, consumer->drainAsFormData());
     EXPECT_EQ(BytesConsumer::PublicState::Closed, consumer->getPublicState());
 }
 
 } // namespace blink