Get views_unittests pass on touch build

views/focus/focus_manager_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 "testing/gtest/include/gtest/gtest.h"
-
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/gfx/rect.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/radio_button.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/combobox/native_combobox_wrapper.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/scroll_view.h"
 #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/focus/focus_manager_factory.h"
+#include "views/test/views_test_base.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_delegate.h"
 #include "views/window/non_client_view.h"
 
 #if defined(OS_LINUX)
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 #endif
 
 namespace {
@@ skipping 53 matching lines @@
 const int kHelpLinkID = count++;
 
 const int kThumbnailContainerID = count++;  // 45
 const int kThumbnailStarID = count++;
 const int kThumbnailSuperStarID = count++;
 
 }  // namespace
 
 namespace views {
 
-class FocusManagerTest : public testing::Test, public WidgetDelegate {
+class FocusManagerTest : public ViewsTestBase, public WidgetDelegate {
  public:
   FocusManagerTest()
       : window_(NULL),
         content_view_(NULL),
         focus_change_listener_(NULL) {
-#if defined(OS_WIN)
-    OleInitialize(NULL);
-#endif
   }
 
   ~FocusManagerTest() {
-#if defined(OS_WIN)
-    OleUninitialize();
-#endif
   }
 
   virtual void SetUp() OVERRIDE {
+    ViewsTestBase::SetUp();
     window_ = Widget::CreateWindowWithBounds(this, bounds());
     InitContentView();
     window_->Show();
   }
 
   virtual void TearDown() OVERRIDE {
     if (focus_change_listener_)
       GetFocusManager()->RemoveFocusChangeListener(focus_change_listener_);
     window_->Close();
 
     // Flush the message loop to make application verifiers happy.
-    message_loop()->RunAllPending();
+    RunPendingMessages();
+    ViewsTestBase::TearDown();
   }
 
   FocusManager* GetFocusManager() {
     return window_->GetFocusManager();
   }
 
   void FocusNativeView(gfx::NativeView native_view) {
 #if defined(OS_WIN)
     ::SendMessage(native_view, WM_SETFOCUS, NULL, NULL);
 #else
@@ skipping 43 matching lines @@
   void SimulateDeactivateWindow() {
 #if defined(OS_WIN)
     ::SendMessage(window_->GetNativeWindow(), WM_ACTIVATE, WA_INACTIVE, NULL);
 #else
     gboolean result;
     g_signal_emit_by_name(G_OBJECT(window_->GetNativeWindow()),
                           "focus_out_event", 0, & result);
 #endif
   }
 
-  MessageLoopForUI* message_loop() { return &message_loop_; }
-
   Widget* window_;
   View* content_view_;
 
   void AddFocusChangeListener(FocusChangeListener* listener) {
     ASSERT_FALSE(focus_change_listener_);
     focus_change_listener_ = listener;
     GetFocusManager()->AddFocusChangeListener(listener);
   }
 
 #if defined(OS_WIN)
@@ skipping 41 matching lines @@
 
     g_free(keys);
 
     gdk_event_put(event);
     gdk_event_free(event);
   }
 #endif
 
  private:
   FocusChangeListener* focus_change_listener_;
-  MessageLoopForUI message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusManagerTest);
 };
 
 // BorderView is a view containing a native window with its own view hierarchy.
 // It is interesting to test focus traversal from a view hierarchy to an inner
 // view hierarchy.
 class BorderView : public NativeViewHost {
  public:
   explicit BorderView(View* child) : child_(child), widget_(NULL) {
@@ skipping 686 matching lines @@
   // Simulate an activate, otherwise the deactivate isn't going to do anything.
   SimulateActivateWindow();
 
   NativeTextButton* button = new NativeTextButton(NULL, L"Press me");
   View* view = new View();
   view->set_focusable(true);
 
   content_view_->AddChildView(button);
   button->SetBounds(10, 10, 200, 30);
   content_view_->AddChildView(view);
-  message_loop()->RunAllPending();
+  RunPendingMessages();
 
   TestFocusChangeListener listener;
   AddFocusChangeListener(&listener);
 
   view->RequestFocus();
-  message_loop()->RunAllPending();
+  RunPendingMessages();
   //  MessageLoopForUI::current()->Run(new AcceleratorHandler());
 
   // Visual Studio 2010 has problems converting NULL to the null pointer for
   // std::pair.  See http://connect.microsoft.com/VisualStudio/feedback/details/520043/error-converting-from-null-to-a-pointer-type-in-std-pair
   // It will work if we pass nullptr.
 #if defined(_MSC_VER) && _MSC_VER >= 1600
   views::View* null_view = nullptr;
 #else
   views::View* null_view = NULL;
 #endif
@@ skipping 709 matching lines @@
     }
 
     virtual ~WindowDtorTracked() {
       dtor_tracker_->push_back("WindowDtorTracked");
     }
 
     DtorTrackVector* dtor_tracker_;
   };
 
   virtual void SetUp() {
+    ViewsTestBase::SetUp();
     FocusManagerFactory::Install(new TestFocusManagerFactory(&dtor_tracker_));
     // Create WindowDtorTracked that uses FocusManagerDtorTracked.
     window_ = new WindowDtorTracked(&dtor_tracker_);
     Widget::InitParams params;
     params.delegate = this;
     params.bounds = gfx::Rect(0, 0, 100, 100);
     window_->Init(params);
 
     tracked_focus_manager_ =
         static_cast<FocusManagerDtorTracked*>(GetFocusManager());
     window_->Show();
   }
 
   virtual void TearDown() {
     if (window_) {
       window_->Close();
-      message_loop()->RunAllPending();
+      RunPendingMessages();
     }
     FocusManagerFactory::Install(NULL);
+    ViewsTestBase::TearDown();
   }
 
   FocusManager* tracked_focus_manager_;
   DtorTrackVector dtor_tracker_;
 };
 
 TEST_F(FocusManagerDtorTest, FocusManagerDestructedLast) {
   // Setup views hierarchy.
   TabbedPane* tabbed_pane = new TabbedPane();
   content_view_->AddChildView(tabbed_pane);
 
   NativeButtonDtorTracked* button = new NativeButtonDtorTracked(L"button",
                                                                 &dtor_tracker_);
   tabbed_pane->AddTab(L"Awesome tab", button);
 
   // Close the window.
   window_->Close();
-  message_loop()->RunAllPending();
+  RunPendingMessages();
 
   // Test window, button and focus manager should all be destructed.
   ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size()));
 
   // Focus manager should be the last one to destruct.
   ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
 
   // Clear window_ so that we don't try to close it again.
   window_ = NULL;
 }
 
 }  // namespace views