| Index: views/bubble/bubble_view_unittest.cc
|
| ===================================================================
|
| --- views/bubble/bubble_view_unittest.cc (revision 104542)
|
| +++ views/bubble/bubble_view_unittest.cc (working copy)
|
| @@ -9,12 +9,16 @@
|
| #include "views/bubble/bubble_border.h"
|
| #include "views/bubble/bubble_delegate.h"
|
| #include "views/bubble/bubble_view.h"
|
| +#include "views/test/views_test_base.h"
|
| #include "views/widget/widget.h"
|
|
|
| namespace views {
|
|
|
| namespace {
|
|
|
| +typedef ViewsTestBase BubbleViewBasicTest;
|
| +typedef ViewsTestBase BubbleViewTest;
|
| +
|
| class TestBubbleDelegate : public BubbleDelegateView {
|
| public:
|
| explicit TestBubbleDelegate(Widget *frame): BubbleDelegateView(frame) {}
|
| @@ -42,8 +46,7 @@
|
| };
|
|
|
|
|
| -TEST(BubbleViewBasicTest, CreateArrowBubble) {
|
| - MessageLoopForUI message_loop;
|
| +TEST_F(BubbleViewBasicTest, CreateArrowBubble) {
|
| scoped_ptr<Widget> bubble_widget(new Widget());
|
| Widget::InitParams params(Widget::InitParams::TYPE_BUBBLE);
|
| TestBubbleDelegate delegate(bubble_widget.get());
|
| @@ -57,14 +60,12 @@
|
| EXPECT_EQ(delegate.GetFrameArrowLocation(), border->arrow_location());
|
| bubble_widget->CloseNow();
|
| bubble_widget.reset(NULL);
|
| - MessageLoop::current()->RunAllPending();
|
| + RunPendingMessages();
|
| }
|
|
|
| } // namespace
|
|
|
| -TEST(BubbleViewTest, FadeAnimation) {
|
| - MessageLoopForUI message_loop;
|
| -
|
| +TEST_F(BubbleViewTest, FadeAnimation) {
|
| scoped_ptr<Widget> bubble_widget(new Widget());
|
| Widget::InitParams params(Widget::InitParams::TYPE_BUBBLE);
|
| TestBubbleDelegate delegate(bubble_widget.get());
|
| @@ -84,7 +85,7 @@
|
| EXPECT_EQ(1, test_animation_delegate.animation_ended_);
|
| bubble_widget->CloseNow();
|
| bubble_widget.reset(NULL);
|
| - MessageLoop::current()->RunAllPending();
|
| + RunPendingMessages();
|
| }
|
|
|
| } // namespace views
|
|
|