Refactor common unit test code.

src/compiler/machine-operator-unittest.cc

 // Copyright 2014 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.
 
-#include "src/compiler/compiler-unittests.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/operator-properties-inl.h"
-#include "testing/gmock/include/gmock/gmock.h"
-
-using testing::IsNull;
+#include "src/test/test-utils.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
-class MachineOperatorCommonTest : public CompilerTestWithParam<MachineType> {
+class MachineOperatorCommonTest
+    : public TestWithZone,
+      public ::testing::WithParamInterface<MachineType> {
  public:
   MachineOperatorCommonTest() : machine_(NULL) {}
-  virtual ~MachineOperatorCommonTest() { EXPECT_THAT(machine_, IsNull()); }
+  virtual ~MachineOperatorCommonTest() { EXPECT_EQ(NULL, machine_); }
 
   virtual void SetUp() OVERRIDE {
-    CompilerTestWithParam<MachineType>::SetUp();
+    TestWithZone::SetUp();
+    EXPECT_EQ(NULL, machine_);
     machine_ = new MachineOperatorBuilder(zone(), GetParam());
   }
 
   virtual void TearDown() OVERRIDE {
+    ASSERT_TRUE(machine_ != NULL);
     delete machine_;
     machine_ = NULL;
-    CompilerTestWithParam<MachineType>::TearDown();
+    TestWithZone::TearDown();
   }
 
  protected:
   MachineOperatorBuilder* machine() const { return machine_; }
 
  private:
   MachineOperatorBuilder* machine_;
 };
 
 
@@ skipping 36 matching lines @@
   EXPECT_EQ(1, OperatorProperties::GetValueOutputCount(op));
 }
 
 
 INSTANTIATE_TEST_CASE_P(MachineOperatorTest, MachineOperatorCommonTest,
                         ::testing::Values(kRepWord32, kRepWord64));
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8