1 files changed, 17 insertions, 1 deletions
diff --git a/views/test/views_test_base.cc b/views/test/views_test_base.cc
index c78bf27..33a3c47 100644
--- a/views/test/views_test_base.cc
+++ b/views/test/views_test_base.cc
@@ -10,7 +10,9 @@
 
 namespace views {
 
-ViewsTestBase::ViewsTestBase() {
+ViewsTestBase::ViewsTestBase()
+    : setup_called_(false),
+      teardown_called_(false) {
 #if defined(OS_WIN)
   OleInitialize(NULL);
 #endif
@@ -20,12 +22,26 @@ ViewsTestBase::~ViewsTestBase() {
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
+  CHECK(setup_called_)
+      << "You have overridden SetUp but never called super class's SetUp";
+  CHECK(teardown_called_)
+      << "You have overrideen TearDown but never called super class's TearDown";
+}
+
+void ViewsTestBase::SetUp() {
+  testing::Test::SetUp();
+  setup_called_ = true;
+  if (!views_delegate_.get())
+    views_delegate_.reset(new TestViewsDelegate());
 }
 
 void ViewsTestBase::TearDown() {
   // Flush the message loop because we have pending release tasks
   // and these tasks if un-executed would upset Valgrind.
   RunPendingMessages();
+  teardown_called_ = true;
+  views_delegate_.reset();
+  testing::Test::TearDown();
 }
 
 }  // namespace views