Platform WebUnitTestSupport onion soup: remove more indirect methods

third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp

Index: third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
index 10824940aad9179c0359a15481b7e693c43902bb..6a6465d4434f02835c55d78bb2dd13ab4a8a36b4 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
@@ -8,8 +8,6 @@
 #include "platform/image-decoders/ImageDecoder.h"
 #include "platform/image-decoders/ImageFrame.h"
 #include "platform/testing/UnitTestHelpers.h"
-#include "public/platform/Platform.h"
-#include "public/platform/WebUnitTestSupport.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/StringHasher.h"
@@ -20,7 +18,7 @@ PassRefPtr<SharedBuffer> readFile(const char* fileName)
 {
     String filePath = testing::blinkRootDir();
     filePath.append(fileName);
-    return Platform::current()->unitTestSupport()->readFromFile(filePath);
+    return testing::readFromFile(filePath);
 }
 
 PassRefPtr<SharedBuffer> readFile(const char* dir, const char* fileName)
@@ -31,7 +29,7 @@ PassRefPtr<SharedBuffer> readFile(const char* dir, const char* fileName)
     filePath.append("/");
     filePath.append(fileName);
 
-    return Platform::current()->unitTestSupport()->readFromFile(filePath);
+    return testing::readFromFile(filePath);
 }
 
 unsigned hashBitmap(const SkBitmap& bitmap)