Remove overly complex MachineNodeFactory.

test/cctest/compiler/structured-machine-assembler.h

Index: test/cctest/compiler/structured-machine-assembler.h
diff --git a/test/cctest/compiler/structured-machine-assembler.h b/test/cctest/compiler/structured-machine-assembler.h
index e5e85edc7f9c3c23c1dacbe536cc9900cd012918..25d6bed962d8ef7e6fb3ea2a3cf26eda8509712d 100644
--- a/test/cctest/compiler/structured-machine-assembler.h
+++ b/test/cctest/compiler/structured-machine-assembler.h
@@ -9,10 +9,10 @@
 
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph-builder.h"
-#include "src/compiler/machine-node-factory.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node.h"
 #include "src/compiler/operator.h"
+#include "src/compiler/raw-machine-assembler.h"
 
 
 namespace v8 {
@@ -40,9 +40,7 @@ class Variable : public ZoneObject {
 };
 
 
-class StructuredMachineAssembler
-    : public GraphBuilder,
-      public MachineNodeFactory<StructuredMachineAssembler> {
+class StructuredMachineAssembler : public RawMachineAssembler {
  public:
   class Environment : public ZoneObject {
    public:
@@ -65,35 +63,15 @@ class StructuredMachineAssembler
                              MachineType word = kMachPtr);
   virtual ~StructuredMachineAssembler() {}
 
-  Isolate* isolate() const { return zone()->isolate(); }
-  Zone* zone() const { return graph()->zone(); }
-  MachineOperatorBuilder* machine() { return &machine_; }
-  CommonOperatorBuilder* common() { return &common_; }
-  CallDescriptor* call_descriptor() const { return call_descriptor_; }
-  size_t parameter_count() const { return machine_sig_->parameter_count(); }
-  MachineSignature* machine_sig() const { return machine_sig_; }
-
-  // Parameters.
-  Node* Parameter(size_t index);
   // Variables.
   Variable NewVariable(Node* initial_value);
   // Control flow.
   void Return(Node* value);
 
-  // MachineAssembler is invalid after export.
-  Schedule* Export();
-
  protected:
   virtual Node* MakeNode(Operator* op, int input_count, Node** inputs);
 
-  Schedule* schedule() {
-    DCHECK(ScheduleValid());
-    return schedule_;
-  }
-
  private:
-  bool ScheduleValid() { return schedule_ != NULL; }
-
   typedef ZoneVector<Environment*> EnvironmentVector;
 
   NodeVector* CurrentVars() { return &current_environment_->variables_; }
@@ -116,12 +94,6 @@ class StructuredMachineAssembler
   void MergeBackEdgesToLoopHeader(Environment* header,
                                   EnvironmentVector* environments);
 
-  Schedule* schedule_;
-  MachineOperatorBuilder machine_;
-  CommonOperatorBuilder common_;
-  MachineSignature* machine_sig_;
-  CallDescriptor* call_descriptor_;
-  Node** parameters_;
   Environment* current_environment_;
   int number_of_variables_;