Delete test view delegate at end of test

Delete test view delegate at end of test

BUG=none
TEST=leak 000000002551055A goes away

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=71309

[jochen (gone - plz use gerrit), 2011-01-12 16:06:25]

meh, the last patch didn't work :(

please review

[Alexander Potapenko, 2011-01-12 16:08:33]

LG

On Wed, Jan 12, 2011 at 7:06 PM,  <jochen@chromium.org> wrote:
> Reviewers: Alexander Potapenko, varunjain,
>
> Message:
> meh, the last patch didn't work :(
>
> please review
>
> Description:
> Delete test view delegate at end of test
>
> BUG=none
> TEST=leak 000000002551055A goes away
>
> Please review this at http://codereview.chromium.org/6132009/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/views/controls/textfield
>
> Affected files:
>  M views/controls/textfield/textfield_views_model_unittest.cc
>
>
> Index: views/controls/textfield/textfield_views_model_unittest.cc
> diff --git a/views/controls/textfield/textfield_views_model_unittest.cc
> b/views/controls/textfield/textfield_views_model_unittest.cc
> index
>
388c8c3953fb7e8bd6448f72036c251013c2af26..1ef17239a0d27f59ac34842c668bebc540ef1212
> 100644
> --- a/views/controls/textfield/textfield_views_model_unittest.cc
> +++ b/views/controls/textfield/textfield_views_model_unittest.cc
> @@ -289,7 +289,10 @@ TEST(TextfieldViewsModelTest, SetText) {
>  }
>
>  TEST(TextfieldViewsModelTest, Clipboard) {
> -  views::ViewsDelegate::views_delegate = new TestViewsDelegate();
> +  scoped_ptr<TestViewsDelegate> test_views_delegate(new
> TestViewsDelegate());
> +  views::ViewsDelegate* original_delegate =
> +      views::ViewsDelegate::views_delegate;
> +  views::ViewsDelegate::views_delegate = test_views_delegate.get();
>   ui::Clipboard* clipboard
>       = views::ViewsDelegate::views_delegate->GetClipboard();
>   string16 initial_clipboard_text;
> @@ -339,6 +342,9 @@ TEST(TextfieldViewsModelTest, Clipboard) {
>   EXPECT_STR_EQ("HELLO HELLO WORLD", clipboard_text);
>   EXPECT_STR_EQ("HELLO HELLO HELLO HELLO WORLD", model.text());
>   EXPECT_EQ(29U, model.cursor_pos());
> +
> +  // Restore original delegate.
> +  views::ViewsDelegate::views_delegate = original_delegate;
>  }
>
>  }  // namespace views
>
>
>



-- 
Alexander Potapenko
Software Engineer
Google Moscow

[varunjain, 2011-01-12 16:10:16]

LGTM
I am curious though regarding how it worked previously without restoring the
delegate

[jochen (gone - plz use gerrit), 2011-01-12 16:17:28]

On 2011/01/12 16:10:16, varunjain wrote:
> LGTM
> I am curious though regarding how it worked previously without restoring the
> delegate

Well, the test delegate was still hanging around.

[jochen (gone - plz use gerrit), 2011-01-12 21:13:25]

me again.

I think I should better use AutoReset to change the delegate back

please review once more

[Alexander Potapenko, 2011-01-13 10:24:21]

On 2011/01/12 21:13:25, jochen wrote:
> me again.
> 
> I think I should better use AutoReset to change the delegate back
> 
> please review once more

Never heard of AutoReset, nice idea

Looks even better to me.