That last CL subverted the purpose of the test. Put it back how it was.

tests/FunctionTest.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFunction.h"
 #include "Test.h"
 
@@ skipping 26 matching lines @@
 
     // AddFive and the lambda above are both small enough to test small-object optimization.
     // Now test a lambda that's much too large for the small-object optimization.
     int a = 1, b = 1, c = 1, d = 1, e = 1;
     test_add_five(r, [&](int x) { return x + a + b + c + d + e; });
 
     // Makes sure we forward the functor when constructing SkFunction.
     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);
 }