platform/testing/{URL|Unit}TestHelpers improvements

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 21 matching lines @@
 
 #include "platform/SharedBuffer.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/WebData.h"
 #include "public/platform/WebSize.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);
+  String filePath = testing::webTestDataPath(fileName);
 
   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));
@@ skipping 30 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