Platform WebUnitTestSupport onion soup: remove more indirect methods

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

 /*
  * Copyright (C) 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * 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.
  */
 
 #include "public/platform/WebImage.h"
 
 #include "platform/SharedBuffer.h"
 #include "platform/testing/UnitTestHelpers.h"
-#include "public/platform/Platform.h"
 #include "public/platform/WebData.h"
 #include "public/platform/WebSize.h"
-#include "public/platform/WebUnitTestSupport.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
 static PassRefPtr<SharedBuffer> readFile(const char* fileName)
 {
     String filePath = testing::blinkRootDir();
     filePath.append("/Source/web/tests/data/");
     filePath.append(fileName);
 
-    return Platform::current()->unitTestSupport()->readFromFile(filePath);
+    return testing::readFromFile(filePath);
 }
 
 TEST(WebImageTest, PNGImage)
 {
     RefPtr<SharedBuffer> data = readFile("white-1x1.png");
     ASSERT_TRUE(data.get());
 
     WebImage image = WebImage::fromData(WebData(data), WebSize());
     EXPECT_TRUE(image.size() == WebSize(1, 1));
     SkAutoLockPixels autoLock(image.getSkBitmap());
@@ skipping 29 matching lines @@
     const char badImage[] = "hello world";
     WebVector<WebImage> images = WebImage::framesFromData(WebData(badImage));
     ASSERT_EQ(0u, images.size());
 
     WebImage image = WebImage::fromData(WebData(badImage), WebSize());
     EXPECT_TRUE(image.getSkBitmap().empty());
     EXPECT_TRUE(image.getSkBitmap().isNull());
 }
 
 } // namespace blink