That last CL subverted the purpose of the test. Put it back how it was.
BUG=skia:
Review URL: https://codereview.chromium.org/1055633003
diff --git a/tests/FunctionTest.cpp b/tests/FunctionTest.cpp
index 01ba588..0feef7c 100644
--- a/tests/FunctionTest.cpp
+++ b/tests/FunctionTest.cpp
@@ -44,7 +44,8 @@
test_add_five(r, MoveOnlyAdd5());
// Makes sure we forward arguments when calling SkFunction.
- REPORTER_ASSERT(r, [](int x, MoveOnlyAdd5&& f, int y) {
- return x * f(y);
- }(2, MoveOnlyAdd5(), 4) == 18);
+ SkFunction<int(int, MoveOnlyAdd5&&, int)> f([](int x, MoveOnlyAdd5&& addFive, int y) {
+ return x * addFive(y);
+ });
+ REPORTER_ASSERT(r, f(2, MoveOnlyAdd5(), 4) == 18);
}