Revert of [refactoring] Split CodeAssemblerState out of CodeAssembler

test/unittests/interpreter/interpreter-assembler-unittest.h

Index: test/unittests/interpreter/interpreter-assembler-unittest.h
diff --git a/test/unittests/interpreter/interpreter-assembler-unittest.h b/test/unittests/interpreter/interpreter-assembler-unittest.h
index 9966aff172df99382591b0069edd4ab93f0e80e0..e3e525273a983a85a8ba0a75d490837dba6a7b0e 100644
--- a/test/unittests/interpreter/interpreter-assembler-unittest.h
+++ b/test/unittests/interpreter/interpreter-assembler-unittest.h
@@ -5,7 +5,6 @@
 #ifndef V8_UNITTESTS_INTERPRETER_INTERPRETER_ASSEMBLER_UNITTEST_H_
 #define V8_UNITTESTS_INTERPRETER_INTERPRETER_ASSEMBLER_UNITTEST_H_
 
-#include "src/compiler/code-assembler.h"
 #include "src/compiler/machine-operator.h"
 #include "src/interpreter/interpreter-assembler.h"
 #include "test/unittests/test-utils.h"
@@ -17,14 +16,6 @@
 
 using ::testing::Matcher;
 
-class InterpreterAssemblerTest;
-
-class InterpreterAssemblerTestState : public compiler::CodeAssemblerState {
- public:
-  InterpreterAssemblerTestState(InterpreterAssemblerTest* test,
-                                Bytecode bytecode);
-};
-
 class InterpreterAssemblerTest : public TestWithIsolateAndZone {
  public:
   InterpreterAssemblerTest() {}
@@ -33,9 +24,10 @@
   class InterpreterAssemblerForTest final : public InterpreterAssembler {
    public:
     InterpreterAssemblerForTest(
-        InterpreterAssemblerTestState* state, Bytecode bytecode,
+        InterpreterAssemblerTest* test, Bytecode bytecode,
         OperandScale operand_scale = OperandScale::kSingle)
-        : InterpreterAssembler(state, bytecode, operand_scale) {}
+        : InterpreterAssembler(test->isolate(), test->zone(), bytecode,
+                               operand_scale) {}
     ~InterpreterAssemblerForTest() override;
 
     Matcher<compiler::Node*> IsLoad(