diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 05:59:37 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 05:59:37 +0000 |
| commit | 6fad26338ed6119903826156f307e20fe6657c31 (patch) | |
| tree | 5c6baed35fce907a0cea47ed6091c941db8ebfd1 /chrome/browser/gtk/bookmark_bar_gtk_unittest.cc | |
| parent | f75c8f13b967b01babc9454506e9d2ed00519e39 (diff) | |
| download | chromium_src-6fad26338ed6119903826156f307e20fe6657c31.zip chromium_src-6fad26338ed6119903826156f307e20fe6657c31.tar.gz chromium_src-6fad26338ed6119903826156f307e20fe6657c31.tar.bz2 | |
Third patch in getting rid of caching MessageLoop pointers and always using ChromeThread instead.
BUG=25354
Review URL: http://codereview.chromium.org/342068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_bar_gtk_unittest.cc')
| -rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk_unittest.cc b/chrome/browser/gtk/bookmark_bar_gtk_unittest.cc index 87fb647..59c6172 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk_unittest.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk_unittest.cc @@ -5,6 +5,7 @@ #include "chrome/browser/gtk/bookmark_bar_gtk.h" #include "chrome/browser/browser.h" +#include "chrome/browser/chrome_thread.h" #include "chrome/browser/gtk/tabstrip_origin_provider.h" #include "base/task.h" #include "testing/gtest/include/gtest/gtest.h" @@ -21,9 +22,12 @@ class EmptyTabstripOriginProvider : public TabstripOriginProvider { class BookmarkBarGtkUnittest : public ::testing::Test { protected: - BookmarkBarGtkUnittest() { + BookmarkBarGtkUnittest() + : ui_thread_(ChromeThread::UI, &message_loop_), + file_thread_(ChromeThread::FILE, &message_loop_) { profile_.reset(new TestingProfile()); profile_->CreateBookmarkModel(true); + profile_->BlockUntilBookmarkModelLoaded(); browser_.reset(new Browser(Browser::TYPE_NORMAL, profile_.get())); origin_provider_.reset(new EmptyTabstripOriginProvider); @@ -35,6 +39,9 @@ class BookmarkBarGtkUnittest : public ::testing::Test { scoped_ptr<Browser> browser_; scoped_ptr<TabstripOriginProvider> origin_provider_; scoped_ptr<BookmarkBarGtk> bookmark_bar_; + MessageLoopForUI message_loop_; + ChromeThread ui_thread_; + ChromeThread file_thread_; }; TEST_F(BookmarkBarGtkUnittest, DisplaysHelpMessageOnEmpty) { |