Revert of [refactoring] Split CodeAssemblerState out of CodeAssembler

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

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "testing/gmock-support.h"
 
 namespace v8 {
 namespace internal {
 namespace interpreter {
 
 using ::testing::Matcher;
 
-class InterpreterAssemblerTest;
-
-class InterpreterAssemblerTestState : public compiler::CodeAssemblerState {
- public:
-  InterpreterAssemblerTestState(InterpreterAssemblerTest* test,
-                                Bytecode bytecode);
-};
-
 class InterpreterAssemblerTest : public TestWithIsolateAndZone {
  public:
   InterpreterAssemblerTest() {}
   ~InterpreterAssemblerTest() override {}
 
   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(
         const Matcher<compiler::LoadRepresentation>& rep_matcher,
         const Matcher<compiler::Node*>& base_matcher,
         const Matcher<compiler::Node*>& index_matcher);
     Matcher<compiler::Node*> IsStore(
         const Matcher<compiler::StoreRepresentation>& rep_matcher,
         const Matcher<compiler::Node*>& base_matcher,
         const Matcher<compiler::Node*>& index_matcher,
@@ skipping 14 matching lines @@
    private:
     DISALLOW_COPY_AND_ASSIGN(InterpreterAssemblerForTest);
   };
 };
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_UNITTESTS_INTERPRETER_INTERPRETER_ASSEMBLER_UNITTEST_H_