Revert of Move collectGarbage* methods to ThreadState

third_party/WebKit/Source/core/html/AutoplayExperimentTest.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 "core/dom/Document.h"
 #include "core/html/AutoplayExperimentHelper.h"
 #include "platform/UserGestureIndicator.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 121 matching lines @@
     }
 
     void TearDown()
     {
         // Be sure that the mock is destructed before the test, so that any
         // missing expectations are noticed.  Otherwise, the test will pass
         // and then missing expectations will show up in the log, without
         // causing a test failure.
         m_helper.clear();
         m_client.clear();
-        ThreadState::current()-> collectAllGarbage();
+        ThreadHeap::collectAllGarbage();
     }
 
     Persistent<MockAutoplayClient> m_client;
     Persistent<AutoplayExperimentHelper> m_helper;
 
     // Mirror updatePlayState to transition to play.
     void startPlayback()
     {
         EXPECT_CALL(*m_client, recordAutoplayMetric(AnyPlaybackStarted))
             .Times(1);
@@ skipping 344 matching lines @@
     m_helper->mutedChanged();
 
     // Verify that unmuting pauses playback.
     setIsMuted(false);
     EXPECT_CALL(*m_client, pauseInternal())
         .Times(1);
     m_helper->mutedChanged();
 }
 
 }