Refactor ViewsDelegate singleton

ui/views/test/views_test_base.cc

Index: ui/views/test/views_test_base.cc
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc
index e508fd72096e7c8d0328a179fe87765a337f9fc5..784ce2e7fa0c236640f9e29f463aaef339ee7219 100644
--- a/ui/views/test/views_test_base.cc
+++ b/ui/views/test/views_test_base.cc
@@ -27,7 +27,7 @@ ViewsTestBase::~ViewsTestBase() {
 void ViewsTestBase::SetUp() {
   testing::Test::SetUp();
   setup_called_ = true;
-  if (!views_delegate_.get())
+  if (!views_delegate_)
     views_delegate_.reset(new TestViewsDelegate());
 
   // The ContextFactory must exist before any Compositors are created.
@@ -53,6 +53,8 @@ void ViewsTestBase::TearDown() {
   ui::ShutdownInputMethodForTesting();
   test_helper_->TearDown();
   ui::TerminateContextFactoryForTests();
+
+  views_delegate_.reset();
 }
 
 void ViewsTestBase::RunPendingMessages() {