Use TestNamer in HLSL tests.

This CL updates the HLSL tests to use the test namer and fixes up places
where the incorrect name was output.

Change-Id: I8510d1ff5a57f3a0996dc9c7c8478775ef141105
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/36940
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
diff --git a/src/writer/hlsl/generator_impl_if_test.cc b/src/writer/hlsl/generator_impl_if_test.cc
index 3825a10..a1d6980 100644
--- a/src/writer/hlsl/generator_impl_if_test.cc
+++ b/src/writer/hlsl/generator_impl_if_test.cc
@@ -35,7 +35,7 @@
   gen.increment_indent();
 
   ASSERT_TRUE(gen.EmitStatement(out, i)) << gen.error();
-  EXPECT_EQ(result(), R"(  if (cond) {
+  EXPECT_EQ(result(), R"(  if (test_cond) {
     return;
   }
 )");
@@ -58,10 +58,10 @@
   gen.increment_indent();
 
   ASSERT_TRUE(gen.EmitStatement(out, i)) << gen.error();
-  EXPECT_EQ(result(), R"(  if (cond) {
+  EXPECT_EQ(result(), R"(  if (test_cond) {
     return;
   } else {
-    if (else_cond) {
+    if (test_else_cond) {
       return;
     }
   }
@@ -84,7 +84,7 @@
   gen.increment_indent();
 
   ASSERT_TRUE(gen.EmitStatement(out, i)) << gen.error();
-  EXPECT_EQ(result(), R"(  if (cond) {
+  EXPECT_EQ(result(), R"(  if (test_cond) {
     return;
   } else {
     return;
@@ -117,10 +117,10 @@
   gen.increment_indent();
 
   ASSERT_TRUE(gen.EmitStatement(out, i)) << gen.error();
-  EXPECT_EQ(result(), R"(  if (cond) {
+  EXPECT_EQ(result(), R"(  if (test_cond) {
     return;
   } else {
-    if (else_cond) {
+    if (test_else_cond) {
       return;
     } else {
       return;