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

chrome/browser/bookmarks/bookmark_table_model_unittest.cc

 // Copyright (c) 2006-2008 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 "app/table_model_observer.h"
+#include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/bookmarks/bookmark_table_model.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/test/testing_profile.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
 
 // Base class for bookmark model tests.
 // Initial state of the bookmark model is as follows:
 // bb
 //   url1 (t0)
 //   f1
 // o
 //   url2 (t0 + 2)
 //   f2
 //   url3 (t0 + 1)
 class BookmarkTableModelTest : public testing::Test,
                                public TableModelObserver {
  public:
   BookmarkTableModelTest()
       : url1_("http://1"),
         url2_("http://2"),
         url3_("http://3"),
         changed_count_(0),
         item_changed_count_(0),
         added_count_(0),
-        removed_count_(0) {
+        removed_count_(0),
+        ui_thread_(ChromeThread::UI, &loop_),
+        file_thread_(ChromeThread::FILE, &loop_) {
   }
 
   virtual void SetUp() {
     profile_.reset(new TestingProfile());
     profile_->CreateBookmarkModel(true);
+    profile_->BlockUntilBookmarkModelLoaded();
     // Populate with some default data.
     Time t0 = Time::Now();
     const BookmarkNode* bb = bookmark_model()->GetBookmarkBarNode();
     bookmark_model()->AddURLWithCreationTime(bb, 0, L"a", url1_, t0);
     bookmark_model()->AddGroup(bb, 1, L"f1");
 
     const BookmarkNode* other = bookmark_model()->other_node();
     bookmark_model()->AddURLWithCreationTime(other, 0, L"b",
         url2_, t0 + TimeDelta::FromDays(2));
     bookmark_model()->AddGroup(other, 1, L"f2");
@@ skipping 52 matching lines @@
   const GURL url1_;
   const GURL url2_;
   const GURL url3_;
 
  private:
   int changed_count_;
   int item_changed_count_;
   int added_count_;
   int removed_count_;
   scoped_ptr<TestingProfile> profile_;
+  MessageLoop loop_;
+  ChromeThread ui_thread_;
+  ChromeThread file_thread_;
 };
 
 // Verifies the count when showing various nodes.
 TEST_F(BookmarkTableModelTest, FolderInitialState) {
   SetModel(BookmarkTableModel::CreateBookmarkTableModelForFolder(
       bookmark_model(), bookmark_model()->GetBookmarkBarNode()));
   ASSERT_EQ(2, model_->RowCount());
   EXPECT_TRUE(bookmark_model()->GetBookmarkBarNode()->GetChild(0) ==
               model_->GetNodeForRow(0));
   EXPECT_TRUE(bookmark_model()->GetBookmarkBarNode()->GetChild(1) ==
@@ skipping 189 matching lines @@
   // Change a folder, this shouldn't change the model.
   bookmark_model()->SetTitle(bookmark_model()->other_node()->GetChild(1),
                              L"new");
   VerifyAndClearOberserverCounts(0, 0, 0, 0);
 
   // Change a url that isn't in the model, this shouldn't send change.
   bookmark_model()->SetTitle(bookmark_model()->other_node()->GetChild(0),
                              L"new");
   VerifyAndClearOberserverCounts(0, 0, 0, 0);
 }