Get views_unittests pass on touch build

views/widget/widget_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/widget/native_widget_views.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/test/test_views_delegate.h"
+#include "views/test/views_test_base.h"
 #include "views/views_delegate.h"
 
 #if defined(OS_WIN)
 #include "views/widget/native_widget_win.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "views/widget/native_widget_gtk.h"
 #endif
 
 namespace views {
 namespace {
@@ skipping 51 matching lines @@
   virtual View* GetDefaultParentView() OVERRIDE {
     return default_parent_view_;
   }
 
  private:
   View* default_parent_view_;
 
   DISALLOW_COPY_AND_ASSIGN(WidgetTestViewsDelegate);
 };
 
-class WidgetTest : public testing::Test {
+class WidgetTest : public ViewsTestBase {
  public:
   WidgetTest() {
-#if defined(OS_WIN)
-    OleInitialize(NULL);
-#endif
   }
   virtual ~WidgetTest() {
-#if defined(OS_WIN)
-    OleUninitialize();
-#endif
   }
 
-  virtual void TearDown() {
-    // Flush the message loop because we have pending release tasks
-    // and these tasks if un-executed would upset Valgrind.
-    RunPendingMessages();
+  virtual void SetUp() OVERRIDE {
+    set_views_delegate(new WidgetTestViewsDelegate());
+    ViewsTestBase::SetUp();
   }
 
-  void RunPendingMessages() {
-    message_loop_.RunAllPending();
+  WidgetTestViewsDelegate& widget_views_delegate() const {
+    return static_cast<WidgetTestViewsDelegate&>(views_delegate());
   }
 
- protected:
-  WidgetTestViewsDelegate views_delegate;
-
  private:
-  MessageLoopForUI message_loop_;
-
   DISALLOW_COPY_AND_ASSIGN(WidgetTest);
 };
 
 NativeWidget* CreatePlatformNativeWidget(
     internal::NativeWidgetDelegate* delegate) {
 #if defined(OS_WIN)
   return new NativeWidgetWin(delegate);
 #elif defined(TOOLKIT_USES_GTK)
   return new NativeWidgetGtkCapture(delegate);
 #endif
@@ skipping 55 matching lines @@
   EXPECT_EQ(toplevel, child->GetTopLevelWidget());
 
   toplevel->CloseNow();
   // |child| should be automatically destroyed with |toplevel|.
 }
 
 TEST_F(WidgetTest, GetTopLevelWidget_Synthetic) {
   // Create a hierarchy consisting of a top level platform native widget and a
   // child NativeWidgetViews.
   Widget* toplevel = CreateTopLevelPlatformWidget();
-  views_delegate.set_default_parent_view(toplevel->GetRootView());
+  widget_views_delegate().set_default_parent_view(toplevel->GetRootView());
   Widget* child = CreateChildNativeWidgetViews();
 
   EXPECT_EQ(toplevel, toplevel->GetTopLevelWidget());
   EXPECT_EQ(child, child->GetTopLevelWidget());
 
   toplevel->CloseNow();
   // |child| should be automatically destroyed with |toplevel|.
 }
 
 // Creates a hierarchy consisting of a top level platform native widget, a child
 // NativeWidgetViews, and a child of that child, another NativeWidgetViews.
 TEST_F(WidgetTest, GetTopLevelWidget_SyntheticParent) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
-  views_delegate.set_default_parent_view(toplevel->GetRootView());
+  widget_views_delegate().set_default_parent_view(toplevel->GetRootView());
 
   Widget* child1 = CreateChildNativeWidgetViews(); // Will be parented
                                                    // automatically to
                                                    // |toplevel|.
   Widget* child11 = CreateChildNativeWidgetViewsWithParent(child1);
 
   EXPECT_EQ(toplevel, toplevel->GetTopLevelWidget());
   EXPECT_EQ(child1, child1->GetTopLevelWidget());
   EXPECT_EQ(child1, child11->GetTopLevelWidget());
 
   toplevel->CloseNow();
   // |child1| and |child11| should be destroyed with |toplevel|.
 }
 
+// This is flaky on touch build. See crbug.com/94137.
+#if defined(TOUCH_UI)
+#define MAYBE_GrabUngrab DISABLED_GrabUngrab
+#else
+#define MAYBE_GrabUngrab GrabUngrab
+#endif
 // Tests some grab/ungrab events.
-TEST_F(WidgetTest, GrabUngrab) {
+TEST_F(WidgetTest, MAYBE_GrabUngrab) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
-  views_delegate.set_default_parent_view(toplevel->GetRootView());
+  widget_views_delegate().set_default_parent_view(toplevel->GetRootView());
 
   Widget* child1 = CreateChildNativeWidgetViews(); // Will be parented
                                                    // automatically to
                                                    // |toplevel|.
   Widget* child2 = CreateChildNativeWidgetViews();
 
   toplevel->SetBounds(gfx::Rect(0, 0, 500, 500));
 
   child1->SetBounds(gfx::Rect(10, 10, 300, 300));
   View* view = new MouseView();
@@ skipping 48 matching lines @@
 // InitParams::Ownership param.
 
 // A WidgetTest that supplies a toplevel widget for NativeWidgetViews to parent
 // to.
 class WidgetOwnershipTest : public WidgetTest {
  public:
   WidgetOwnershipTest() {}
   virtual ~WidgetOwnershipTest() {}
 
   virtual void SetUp() {
+    WidgetTest::SetUp();
     desktop_widget_ = CreateTopLevelPlatformWidget();
-    views_delegate.set_default_parent_view(desktop_widget_->GetRootView());
+    widget_views_delegate().set_default_parent_view(
+        desktop_widget_->GetRootView());
   }
 
   virtual void TearDown() {
     desktop_widget_->CloseNow();
     WidgetTest::TearDown();
   }
 
  private:
   Widget* desktop_widget_;
 
@@ skipping 333 matching lines @@
 
   Widget* widget_closed_;
   Widget* widget_activated_;
   Widget* widget_deactivated_;
   Widget* widget_shown_;
   Widget* widget_hidden_;
 };
 
 TEST_F(WidgetObserverTest, ActivationChange) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
-  views_delegate.set_default_parent_view(toplevel->GetRootView());
+  widget_views_delegate().set_default_parent_view(toplevel->GetRootView());
 
   Widget* child1 = NewWidget();
   Widget* child2 = NewWidget();
 
   reset();
 
   child1->Activate();
   EXPECT_EQ(child1, widget_activated());
 
   child2->Activate();
   EXPECT_EQ(child1, widget_deactivated());
   EXPECT_EQ(child2, widget_activated());
   EXPECT_EQ(child2, active());
 }
 
 TEST_F(WidgetObserverTest, VisibilityChange) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
-  views_delegate.set_default_parent_view(toplevel->GetRootView());
+  widget_views_delegate().set_default_parent_view(toplevel->GetRootView());
 
   Widget* child1 = NewWidget();
   Widget* child2 = NewWidget();
 
   reset();
 
   child1->Hide();
   EXPECT_EQ(child1, widget_hidden());
 
   child2->Hide();
   EXPECT_EQ(child2, widget_hidden());
 
   child1->Show();
   EXPECT_EQ(child1, widget_shown());
 
   child2->Show();
   EXPECT_EQ(child2, widget_shown());
 }
 
 }  // namespace
 }  // namespace views