Distinquish TestWithIsolateAndZone from TestWithZone

test/unittests/test-utils.h

Index: test/unittests/test-utils.h
diff --git a/test/unittests/test-utils.h b/test/unittests/test-utils.h
index 718fd5ac5977e8e6cc999418264af31de1cfb9e3..765b97dd3798b0d9fecfaefd5750bd6a5eae1ece 100644
--- a/test/unittests/test-utils.h
+++ b/test/unittests/test-utils.h
@@ -90,7 +90,7 @@ class TestWithIsolate : public virtual ::v8::TestWithIsolate {
 };
 
 
-class TestWithZone : public TestWithIsolate {
+class TestWithZone : public virtual ::testing::Test {
  public:
   TestWithZone() {}
   virtual ~TestWithZone();
@@ -103,6 +103,21 @@ class TestWithZone : public TestWithIsolate {
   DISALLOW_COPY_AND_ASSIGN(TestWithZone);
 };
 
+
+class TestWithIsolateAndZone : public virtual TestWithIsolate {
+ public:
+  TestWithIsolateAndZone() {}
+  virtual ~TestWithIsolateAndZone();
+
+  Zone* zone() { return &zone_; }
+
+ private:
+  Zone zone_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestWithIsolateAndZone);
+};
+
+
 }  // namespace internal
 }  // namespace v8