Move collectGarbage* methods to ThreadState

third_party/WebKit/Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 2012 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 2691 matching lines @@
     registry.didAddEventHandler(*div, EventHandlerRegistry::ScrollEvent);
     EXPECT_TRUE(registry.hasEventHandlers(EventHandlerRegistry::ScrollEvent));
 
     TrackExceptionState exceptionState;
     div->remove(exceptionState);
 
     // For oilpan we have to force a GC to ensure the event handlers have been removed when
     // checking below. We do a precise GC (collectAllGarbage does not scan the stack)
     // to ensure the div element dies. This is also why the Document is in a Persistent
     // since we want that to stay around.
-    ThreadHeap::collectAllGarbage();
+    ThreadState::current()-> collectAllGarbage();
 
     EXPECT_FALSE(registry.hasEventHandlers(EventHandlerRegistry::ScrollEvent));
 }
 
 class NonUserInputTextUpdateWebWidgetClient: public FrameTestHelpers::TestWebWidgetClient {
 public:
     NonUserInputTextUpdateWebWidgetClient() : m_textIsUpdated(false) { }
 
     // WebWidgetClient methods
     void didUpdateTextOfFocusedElementByNonUserInput() override
@@ skipping 641 matching lines @@
             EXPECT_TRUE(webView->page()->defersLoading());
         }
 
         EXPECT_TRUE(webView->page()->defersLoading());
     }
 
     EXPECT_FALSE(webView->page()->defersLoading());
 }
 
 } // namespace blink