Third patch in getting rid of caching MessageLoop pointers and always using C...

chrome/browser/gtk/bookmark_bar_gtk_unittest.cc

 // Copyright (c) 2009 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 "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"
 #include "chrome/test/testing_profile.h"
 
 // Dummy implementation that's good enough for the tests; we don't test
 // rendering here so all we need is a non-NULL object.
 class EmptyTabstripOriginProvider : public TabstripOriginProvider {
  public:
   virtual gfx::Point GetTabStripOriginForWidget(GtkWidget* widget) {
     return gfx::Point(0, 0);
   }
 };
 
 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);
     bookmark_bar_.reset(new BookmarkBarGtk(NULL, profile_.get(), browser_.get(),
                                            origin_provider_.get()));
   }
 
   scoped_ptr<TestingProfile> profile_;
   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) {
   BookmarkModel* model = profile_->GetBookmarkModel();
   bookmark_bar_->Loaded(model);
 
   // There are no bookmarks in the model by default. Expect that the
   // |instructions_label| is shown.
   EXPECT_TRUE(bookmark_bar_->show_instructions_);
 }
@@ skipping 19 matching lines @@
                 L"other", GURL("http://two.com"));
 
   bookmark_bar_->Loaded(model);
 
   // We should expect two children to the bookmark bar's toolbar.
   GList* children = gtk_container_get_children(
       GTK_CONTAINER(bookmark_bar_->bookmark_toolbar_.get()));
   EXPECT_EQ(2U, g_list_length(children));
   g_list_free(children);
 }