Revert of Move collectGarbage* methods to ThreadState

third_party/WebKit/Source/modules/indexeddb/IDBTransactionTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 57 matching lines @@
     EXPECT_CALL(*backend, close())
         .Times(1);
     Persistent<IDBDatabase> db = IDBDatabase::create(scope.getExecutionContext(), std::move(backend), FakeIDBDatabaseCallbacks::create());
 
     const int64_t transactionId = 1234;
     const HashSet<String> transactionScope = HashSet<String>();
     Persistent<IDBTransaction> transaction = IDBTransaction::create(scope.getScriptState(), transactionId, transactionScope, WebIDBTransactionModeReadOnly, db.get());
     PersistentHeapHashSet<WeakMember<IDBTransaction>> set;
     set.add(transaction);
 
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(1u, set.size());
 
     Persistent<IDBRequest> request = IDBRequest::create(scope.getScriptState(), IDBAny::createUndefined(), transaction.get());
     deactivateNewTransactions(scope.isolate());
 
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(1u, set.size());
 
     // This will generate an abort() call to the back end which is dropped by the fake proxy,
     // so an explicit onAbort call is made.
     scope.getExecutionContext()->stopActiveDOMObjects();
     transaction->onAbort(DOMException::create(AbortError, "Aborted"));
     transaction.clear();
 
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(0u, set.size());
 }
 
 TEST(IDBTransactionTest, TransactionFinish)
 {
     V8TestingScope scope;
     const int64_t transactionId = 1234;
 
     std::unique_ptr<MockWebIDBDatabase> backend = MockWebIDBDatabase::create();
     EXPECT_CALL(*backend, commit(transactionId))
         .Times(1);
     EXPECT_CALL(*backend, close())
         .Times(1);
     Persistent<IDBDatabase> db = IDBDatabase::create(scope.getExecutionContext(), std::move(backend), FakeIDBDatabaseCallbacks::create());
 
     const HashSet<String> transactionScope = HashSet<String>();
     Persistent<IDBTransaction> transaction = IDBTransaction::create(scope.getScriptState(), transactionId, transactionScope, WebIDBTransactionModeReadOnly, db.get());
     PersistentHeapHashSet<WeakMember<IDBTransaction>> set;
     set.add(transaction);
 
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(1u, set.size());
 
     deactivateNewTransactions(scope.isolate());
 
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(1u, set.size());
 
     transaction.clear();
 
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(1u, set.size());
 
     // Stop the context, so events don't get queued (which would keep the transaction alive).
     scope.getExecutionContext()->stopActiveDOMObjects();
 
     // Fire an abort to make sure this doesn't free the transaction during use. The test
     // will not fail if it is, but ASAN would notice the error.
     db->onAbort(transactionId, DOMException::create(AbortError, "Aborted"));
 
     // onAbort() should have cleared the transaction's reference to the database.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(0u, set.size());
 }
 
 } // namespace
 } // namespace blink