diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 07:12:19 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 07:12:19 +0000 |
| commit | b3bb8a695ff6972eac774780b33df99515a53b3f (patch) | |
| tree | f49776f4b72c125b3d30251bff89ed7a8b2c1a37 | |
| parent | 20ec9ee22f330a2a8c314b7bde187fb9defafa4e (diff) | |
| download | chromium_src-b3bb8a695ff6972eac774780b33df99515a53b3f.zip chromium_src-b3bb8a695ff6972eac774780b33df99515a53b3f.tar.gz chromium_src-b3bb8a695ff6972eac774780b33df99515a53b3f.tar.bz2 | |
Fix windows interactive ui test failure introduced in r30687.
BUG=25354
TBR=estade
Review URL: http://codereview.chromium.org/353003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30690 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view_test.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc index cedfd19..5c89c66 100644 --- a/chrome/browser/views/bookmark_bar_view_test.cc +++ b/chrome/browser/views/bookmark_bar_view_test.cc @@ -69,7 +69,11 @@ class TestingPageNavigator : public PageNavigator { class BookmarkBarViewEventTestBase : public ViewEventTestBase { public: BookmarkBarViewEventTestBase() - : ViewEventTestBase(), model_(NULL), bb_view_(NULL) { + : ViewEventTestBase(), + model_(NULL), + bb_view_(NULL), + ui_thread_(ChromeThread::UI, MessageLoop::current()), + file_thread_(ChromeThread::FILE, MessageLoop::current()) { } virtual void SetUp() { @@ -79,6 +83,7 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { profile_.reset(new TestingProfile()); profile_->set_has_history_service(true); profile_->CreateBookmarkModel(true); + profile_->BlockUntilBookmarkModelLoaded(); profile_->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true); model_ = profile_->GetBookmarkModel(); @@ -171,6 +176,8 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { gfx::Size bb_view_pref_; scoped_ptr<TestingProfile> profile_; + ChromeThread ui_thread_; + ChromeThread file_thread_; }; // Clicks on first menu, makes sure button is depressed. Moves mouse to first |