Initialize shell and browser thread for views event tests.

 This is necessary as widget now needs shell to activate.

BUG=none
TEST=interactive_ui_tests no longer crashes.

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

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

3 files changed, 8 insertions, 2 deletions

diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 5a14df4..44d60a4 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -172,7 +172,6 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase {
       : ViewEventTestBase(),
         model_(NULL),
         bb_view_(NULL),
-        ui_thread_(BrowserThread::UI, MessageLoop::current()),
         file_thread_(BrowserThread::FILE, MessageLoop::current()) {
   }
 
@@ -292,7 +291,6 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase {
   gfx::Size bb_view_pref_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<Browser> browser_;
-  content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   ViewsDelegateImpl views_delegate_;
 };
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index 91ab67b..b00ce6a 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -15,12 +15,14 @@
 #include "base/string_number_conversions.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/browser_thread.h"
 #include "ui/gfx/compositor/test/compositor_test_support.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/root_window.h"
+#include "ui/aura_shell/shell.h"
 #endif
 
 namespace {
@@ -60,6 +62,7 @@ const int kMouseMoveDelayMS = 200;
 ViewEventTestBase::ViewEventTestBase()
   : window_(NULL),
     content_view_(NULL),
+    ui_thread_(content::BrowserThread::UI, &message_loop_),
     ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
@@ -89,6 +92,7 @@ void ViewEventTestBase::SetUp() {
   ui::CompositorTestSupport::Initialize();
 #if defined(USE_AURA)
   aura::RootWindow::GetInstance();
+  aura_shell::Shell::CreateInstance(NULL);
 #endif
   window_ = views::Widget::CreateWindow(this);
 }
@@ -104,6 +108,7 @@ void ViewEventTestBase::TearDown() {
     window_ = NULL;
   }
 #if defined(USE_AURA)
+  aura_shell::Shell::DeleteInstance();
   aura::RootWindow::DeleteInstance();
 #endif
   ui::CompositorTestSupport::Terminate();
diff --git a/chrome/test/base/view_event_test_base.h b/chrome/test/base/view_event_test_base.h
index 556f65a..b4eda60 100644
--- a/chrome/test/base/view_event_test_base.h
+++ b/chrome/test/base/view_event_test_base.h
@@ -16,6 +16,7 @@
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
+#include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ -134,6 +135,8 @@ class ViewEventTestBase : public views::WidgetDelegate,
 
   MessageLoopForUI message_loop_;
 
+  content::TestBrowserThread ui_thread_;
+
   // Method factory used for time-outs.
   ScopedRunnableMethodFactory<ViewEventTestBase> method_factory_;