[wasm] Make WasmRunner the central test structure

test/cctest/wasm/test-run-wasm-simd.cc

Index: test/cctest/wasm/test-run-wasm-simd.cc
diff --git a/test/cctest/wasm/test-run-wasm-simd.cc b/test/cctest/wasm/test-run-wasm-simd.cc
index 6172e733d39245bca4a8e826b33f9ad465e419aa..2905473b17d048031ff224856eb73c82bb94ecd2 100644
--- a/test/cctest/wasm/test-run-wasm-simd.cc
+++ b/test/cctest/wasm/test-run-wasm-simd.cc
@@ -45,7 +45,7 @@ WASM_EXEC_TEST(I32x4Splat) {
   //   return 0
   //
   // return 1
-  WasmRunner<int32_t> r(kExecuteCompiled, MachineType::Int32());
+  WasmRunner<int32_t, int32_t> r(kExecuteCompiled);
   byte lane_val = 0;
   byte simd = r.AllocateLocal(kAstS128);
   BUILD(r, WASM_BLOCK(WASM_SET_LOCAL(simd, WASM_SIMD_I32x4_SPLAT(
@@ -58,8 +58,7 @@ WASM_EXEC_TEST(I32x4Splat) {
 
 WASM_EXEC_TEST(I32x4ReplaceLane) {
   FLAG_wasm_simd_prototype = true;
-  WasmRunner<int32_t> r(kExecuteCompiled, MachineType::Int32(),
-                        MachineType::Int32());
+  WasmRunner<int32_t, int32_t, int32_t> r(kExecuteCompiled);
   byte old_val = 0;
   byte new_val = 1;
   byte simd = r.AllocateLocal(kAstS128);
@@ -92,8 +91,7 @@ WASM_EXEC_TEST(I32x4ReplaceLane) {
 
 WASM_EXEC_TEST(I32x4Add) {
   FLAG_wasm_simd_prototype = true;
-  WasmRunner<int32_t> r(kExecuteCompiled, MachineType::Int32(),
-                        MachineType::Int32(), MachineType::Int32());
+  WasmRunner<int32_t, int32_t, int32_t, int32_t> r(kExecuteCompiled);
   byte a = 0;
   byte b = 1;
   byte expected = 2;
@@ -115,8 +113,7 @@ WASM_EXEC_TEST(I32x4Add) {
 
 WASM_EXEC_TEST(I32x4Sub) {
   FLAG_wasm_simd_prototype = true;
-  WasmRunner<int32_t> r(kExecuteCompiled, MachineType::Int32(),
-                        MachineType::Int32(), MachineType::Int32());
+  WasmRunner<int32_t, int32_t, int32_t, int32_t> r(kExecuteCompiled);
   byte a = 0;
   byte b = 1;
   byte expected = 2;