From 046b3cd28e44cb76417136fee0a218eaad64d5f2 Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@gmail.com>
Date: Mon, 8 Apr 2019 16:11:21 -0700
Subject: [PATCH] Get rid of the macro for accessing the current test name.
 (#8500)

---
 runtime/dart_isolate_unittests.cc | 35 +++++++++++++------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/runtime/dart_isolate_unittests.cc b/runtime/dart_isolate_unittests.cc
index e2a7c734bb1..6a09e62a78a 100644
--- a/runtime/dart_isolate_unittests.cc
+++ b/runtime/dart_isolate_unittests.cc
@@ -15,11 +15,6 @@
 #include "flutter/testing/thread_test.h"
 #include "third_party/tonic/scopes/dart_isolate_scope.h"
 
-#define CURRENT_TEST_NAME                                           \
-  std::string {                                                     \
-    ::testing::UnitTest::GetInstance()->current_test_info()->name() \
-  }
-
 namespace blink {
 namespace testing {
 
@@ -31,11 +26,11 @@ TEST_F(DartIsolateTest, RootIsolateCreationAndShutdown) {
   ASSERT_TRUE(vm_ref);
   auto vm_data = vm_ref.GetVMData();
   ASSERT_TRUE(vm_data);
-  TaskRunners task_runners(CURRENT_TEST_NAME,       //
-                           GetCurrentTaskRunner(),  //
-                           GetCurrentTaskRunner(),  //
-                           GetCurrentTaskRunner(),  //
-                           GetCurrentTaskRunner()   //
+  TaskRunners task_runners(::testing::GetCurrentTestName(),  //
+                           GetCurrentTaskRunner(),           //
+                           GetCurrentTaskRunner(),           //
+                           GetCurrentTaskRunner(),           //
+                           GetCurrentTaskRunner()            //
   );
   auto weak_isolate = DartIsolate::CreateRootIsolate(
       vm_data->GetSettings(),         // settings
@@ -60,11 +55,11 @@ TEST_F(DartIsolateTest, IsolateShutdownCallbackIsInIsolateScope) {
   ASSERT_TRUE(vm_ref);
   auto vm_data = vm_ref.GetVMData();
   ASSERT_TRUE(vm_data);
-  TaskRunners task_runners(CURRENT_TEST_NAME,       //
-                           GetCurrentTaskRunner(),  //
-                           GetCurrentTaskRunner(),  //
-                           GetCurrentTaskRunner(),  //
-                           GetCurrentTaskRunner()   //
+  TaskRunners task_runners(::testing::GetCurrentTestName(),  //
+                           GetCurrentTaskRunner(),           //
+                           GetCurrentTaskRunner(),           //
+                           GetCurrentTaskRunner(),           //
+                           GetCurrentTaskRunner()            //
   );
   auto weak_isolate = DartIsolate::CreateRootIsolate(
       vm_data->GetSettings(),         // settings
@@ -159,11 +154,11 @@ static void RunDartCodeInIsolate(std::unique_ptr<AutoIsolateShutdown>& result,
     return;
   }
 
-  TaskRunners task_runners(CURRENT_TEST_NAME,  //
-                           task_runner,        //
-                           task_runner,        //
-                           task_runner,        //
-                           task_runner         //
+  TaskRunners task_runners(::testing::GetCurrentTestName(),  //
+                           task_runner,                      //
+                           task_runner,                      //
+                           task_runner,                      //
+                           task_runner                       //
   );
 
   auto vm_data = vm_ref.GetVMData();