Platform WebUnitTestSupport onion soup: remove more indirect methods

third_party/WebKit/Source/platform/fonts/TestFontSelector.h

 /*
  * Copyright (C) 2015 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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef TestFontSelector_h
 #define TestFontSelector_h
 
 #include "platform/fonts/FontCustomPlatformData.h"
 #include "platform/fonts/FontSelector.h"
-#include "public/platform/Platform.h"
-#include "public/platform/WebUnitTestSupport.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/AtomicString.h"
 
 namespace blink {
 
 class TestFontSelector : public FontSelector {
 public:
     static PassRefPtrWillBeRawPtr<TestFontSelector> create(const String& path)
     {
-        WebUnitTestSupport* unitTestSupport = Platform::current()->
-            unitTestSupport();
-        RefPtr<SharedBuffer> fontBuffer = static_cast<PassRefPtr<SharedBuffer>>(
-            unitTestSupport->readFromFile(path));
+        RefPtr<SharedBuffer> fontBuffer = testing::readFromFile(path);
         String otsParseMessage;
         return adoptRefWillBeNoop(new TestFontSelector(FontCustomPlatformData::create(
             fontBuffer.get(), otsParseMessage)));
     }
 
     ~TestFontSelector() override { }
 
     PassRefPtr<FontData> getFontData(const FontDescription& fontDescription,
         const AtomicString& familyName) override
     {
@@ skipping 34 matching lines @@
     fontDescription.setComputedSize(size);
 
     Font font(fontDescription);
     font.update(TestFontSelector::create(fontPath));
     return font;
 }
 
 } // namespace blink
 
 #endif // TestFontSelector_h