Enable TestViewsDelegates for views unittests and views_examples by default

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6980004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84720 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 15 insertions, 19 deletions

diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc
index 4eb80db..11d6a5b 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/views/controls/textfield/native_textfield_views_unittest.cc
@@ -534,10 +534,6 @@ void VerifyTextfieldContextMenuContents(bool textfield_has_selection,
 }
 
 TEST_F(NativeTextfieldViewsTest, ContextMenuDisplayTest) {
-  scoped_ptr<TestViewsDelegate> test_views_delegate(new TestViewsDelegate());
-  AutoReset<views::ViewsDelegate*> auto_reset(
-      &views::ViewsDelegate::views_delegate, test_views_delegate.get());
-  views::ViewsDelegate::views_delegate = test_views_delegate.get();
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16("hello world"));
   EXPECT_TRUE(GetContextMenu());
@@ -804,10 +800,6 @@ TEST_F(NativeTextfieldViewsTest, DragAndDrop_Canceled) {
 }
 
 TEST_F(NativeTextfieldViewsTest, ReadOnlyTest) {
-  scoped_ptr<TestViewsDelegate> test_views_delegate(new TestViewsDelegate());
-  AutoReset<views::ViewsDelegate*> auto_reset(
-      &views::ViewsDelegate::views_delegate, test_views_delegate.get());
-
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16(" one two three "));
   textfield_->SetReadOnly(true);
diff --git a/views/controls/textfield/textfield_views_model_unittest.cc b/views/controls/textfield/textfield_views_model_unittest.cc
index c735332..7271adc 100644
--- a/views/controls/textfield/textfield_views_model_unittest.cc
+++ b/views/controls/textfield/textfield_views_model_unittest.cc
@@ -319,9 +319,6 @@ TEST_F(TextfieldViewsModelTest, SetText) {
 }
 
 TEST_F(TextfieldViewsModelTest, Clipboard) {
-  scoped_ptr<TestViewsDelegate> test_views_delegate(new TestViewsDelegate());
-  AutoReset<views::ViewsDelegate*> auto_reset(
-      &views::ViewsDelegate::views_delegate, test_views_delegate.get());
   ui::Clipboard* clipboard
       = views::ViewsDelegate::views_delegate->GetClipboard();
   string16 initial_clipboard_text;
diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc
index 94c30cf..d46fb72 100644
--- a/views/examples/examples_main.cc
+++ b/views/examples/examples_main.cc
@@ -33,6 +33,7 @@
 #include "views/layout/grid_layout.h"
 #include "views/widget/root_view.h"
 #include "views/window/window.h"
+#include "views/test/test_views_delegate.h"
 
 #if defined(OS_WIN)
 // TableView is not yet ported to Linux.
@@ -183,6 +184,7 @@ int main(int argc, char** argv) {
   g_type_init();
   gtk_init(&argc, &argv);
 #endif
+  TestViewsDelegate delegate;
 
   CommandLine::Init(argc, argv);
 
diff --git a/views/test/test_views_delegate.cc b/views/test/test_views_delegate.cc
index a9f9b58..1215af7 100644
--- a/views/test/test_views_delegate.cc
+++ b/views/test/test_views_delegate.cc
@@ -4,8 +4,15 @@
 
 #include "views/test/test_views_delegate.h"
 
-TestViewsDelegate::TestViewsDelegate() {}
-TestViewsDelegate::~TestViewsDelegate() {}
+#include "base/logging.h"
+
+TestViewsDelegate::TestViewsDelegate() {
+  DCHECK(!views::ViewsDelegate::views_delegate);
+  views::ViewsDelegate::views_delegate = this;
+}
+TestViewsDelegate::~TestViewsDelegate() {
+  views::ViewsDelegate::views_delegate = NULL;
+}
 
 ui::Clipboard* TestViewsDelegate::GetClipboard() const {
   if (!clipboard_.get()) {
diff --git a/views/test/views_test_base.h b/views/test/views_test_base.h
index 7c45c2e..9fa4542 100644
--- a/views/test/views_test_base.h
+++ b/views/test/views_test_base.h
@@ -9,6 +9,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/message_loop.h"
+#include "views/test/test_views_delegate.h"
 
 namespace views {
 
@@ -28,6 +29,7 @@ class ViewsTestBase : public testing::Test {
 
  private:
   MessageLoopForUI message_loop_;
+  TestViewsDelegate views_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewsTestBase);
 };
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index 0b93d8b..039c534 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -862,8 +862,6 @@ TEST_F(ViewTest, Textfield) {
 
 // Tests that the Textfield view respond appropiately to cut/copy/paste.
 TEST_F(ViewTest, TextfieldCutCopyPaste) {
-  views::ViewsDelegate::views_delegate = new TestViewsDelegate;
-
   const std::wstring kNormalText = L"Normal";
   const std::wstring kReadOnlyText = L"Read only";
   const std::wstring kPasswordText = L"Password! ** Secret stuff **";
@@ -970,9 +968,6 @@ TEST_F(ViewTest, TextfieldCutCopyPaste) {
   ::SendMessage(normal->GetTestingHandle(), WM_PASTE, 0, 0);
   ::GetWindowText(normal->GetTestingHandle(), buffer, 1024);
   EXPECT_EQ(kReadOnlyText, std::wstring(buffer));
-
-  delete views::ViewsDelegate::views_delegate;
-  views::ViewsDelegate::views_delegate = NULL;
 }
 #endif
 
diff --git a/views/views.gyp b/views/views.gyp
index 58d366d..6489d87 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -600,7 +600,8 @@
         'examples/throbber_example.h',
         'examples/widget_example.cc',
         'examples/widget_example.h',
-
+        'test/test_views_delegate.cc',
+        'test/test_views_delegate.h',
         '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
       ],
       'conditions': [