Revert "resources: remove most uses of GetResourcePath()"

This reverts commit 5093a539def3ae09df324018f2343827009b2e05.

Reason for revert: google3 seems broken

Original change's description:
> resources: remove most uses of GetResourcePath()
> 
> Going forward, we will standardize on GetResourceAsData(), which will
> make it easier to run tests in environments without access to the
> filesystem.
> 
> Also: GetResourceAsData() complains when a resource is missing.
> This is usually an error.
> 
> Change-Id: Iaf70b71b0ca5ed8cd1a5538a60ef185ae8736188
> Reviewed-on: https://skia-review.googlesource.com/82642
> Reviewed-by: Hal Canary <halcanary@google.com>
> Commit-Queue: Hal Canary <halcanary@google.com>

TBR=halcanary@google.com,scroggo@google.com

Change-Id: Ic5a7c0167c995a672e6b06dc92abe00564432214
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/83001
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/tests/ICCTest.cpp b/tests/ICCTest.cpp
index 4933155148..4bff6546ef 100644
--- a/tests/ICCTest.cpp
+++ b/tests/ICCTest.cpp
@@ -39,7 +39,8 @@ DEF_TEST(ICC_ToXYZD50, r) {
         0.74519f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f,
     };
 
-    sk_sp<SkData> data = GetResourceAsData("icc_profiles/HP_ZR30w.icc");
+    sk_sp<SkData> data = SkData::MakeFromFileName(
+            GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str());
     sk_sp<SkICC> z30 = SkICC::Make(data->data(), data->size());
     test_to_xyz_d50(r, z30.get(), true, z30Reference);
 
@@ -48,15 +49,15 @@ DEF_TEST(ICC_ToXYZD50, r) {
         0.75368f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f,
     };
 
-    data = GetResourceAsData("icc_profiles/HP_Z32x.icc");
+    data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str());
     sk_sp<SkICC> z32 = SkICC::Make(data->data(), data->size());
     test_to_xyz_d50(r, z32.get(), true, z32Reference);
 
-    data = GetResourceAsData("icc_profiles/upperLeft.icc");
+    data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str());
     sk_sp<SkICC> upperLeft = SkICC::Make(data->data(), data->size());
     test_to_xyz_d50(r, upperLeft.get(), false, z32Reference);
 
-    data = GetResourceAsData("icc_profiles/upperRight.icc");
+    data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str());
     sk_sp<SkICC> upperRight = SkICC::Make(data->data(), data->size());
     test_to_xyz_d50(r, upperRight.get(), false, z32Reference);
 }
@@ -81,19 +82,20 @@ DEF_TEST(ICC_IsNumericalTransferFn, r) {
     referenceFn.fF = 0.0f;
     referenceFn.fG = 2.2f;
 
-    sk_sp<SkData> data = GetResourceAsData("icc_profiles/HP_ZR30w.icc");
+    sk_sp<SkData> data = SkData::MakeFromFileName(
+            GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str());
     sk_sp<SkICC> z30 = SkICC::Make(data->data(), data->size());
     test_is_numerical_transfer_fn(r, z30.get(), true, referenceFn);
 
-    data = GetResourceAsData("icc_profiles/HP_Z32x.icc");
+    data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str());
     sk_sp<SkICC> z32 = SkICC::Make(data->data(), data->size());
     test_is_numerical_transfer_fn(r, z32.get(), true, referenceFn);
 
-    data = GetResourceAsData("icc_profiles/upperLeft.icc");
+    data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str());
     sk_sp<SkICC> upperLeft = SkICC::Make(data->data(), data->size());
     test_is_numerical_transfer_fn(r, upperLeft.get(), false, referenceFn);
 
-    data = GetResourceAsData("icc_profiles/upperRight.icc");
+    data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str());
     sk_sp<SkICC> upperRight = SkICC::Make(data->data(), data->size());
     test_is_numerical_transfer_fn(r, upperRight.get(), false, referenceFn);
 }