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

chrome/browser/bookmarks/bookmark_folder_tree_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 "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_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"
 #include "views/controls/tree/tree_view.h"
 
 // Base class for bookmark model tests.
 // Initial state of the bookmark model is as follows:
 // bb
 //   url1
 //   f1
 //     f11
 // o
 //   url2
 //   f2
 //   url3
 //   a1
 //   g1
 class BookmarkFolderTreeModelTest : public testing::Test,
                                     public TreeModelObserver {
  public:
   BookmarkFolderTreeModelTest()
       : url1_("http://1"),
         url2_("http://2"),
         url3_("http://3"),
         added_count_(0),
         removed_count_(0),
         changed_count_(0),
-        reordered_count_(0) {
+        reordered_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.
     const BookmarkNode* bb = bookmark_model()->GetBookmarkBarNode();
     bookmark_model()->AddURL(bb, 0, L"url1", url1_);
     const BookmarkNode* f1 = bookmark_model()->AddGroup(bb, 1, L"f1");
     bookmark_model()->AddGroup(f1, 0, L"f11");
 
     const BookmarkNode* other = bookmark_model()->other_node();
     bookmark_model()->AddURL(other, 0, L"url2", url2_);
     bookmark_model()->AddGroup(other, 1, L"f2");
     bookmark_model()->AddURL(other, 2, L"url3", url3_);
@@ skipping 55 matching lines @@
   const GURL url1_;
   const GURL url2_;
   const GURL url3_;
 
  private:
   int changed_count_;
   int added_count_;
   int removed_count_;
   int reordered_count_;
   scoped_ptr<TestingProfile> profile_;
+  MessageLoop loop_;
+  ChromeThread ui_thread_;
+  ChromeThread file_thread_;
 };
 
 // Verifies the root node has 4 nodes, and the contents of the bookmark bar
 // and other folders matches the initial state.
 TEST_F(BookmarkFolderTreeModelTest, InitialState) {
   // Verify the first 4 nodes.
   TreeModelNode* root = model_->GetRoot();
   ASSERT_EQ(4, model_->GetChildCount(root));
   EXPECT_EQ(BookmarkFolderTreeModel::BOOKMARK,
             model_->GetNodeType(model_->GetChild(root, 0)));
@@ skipping 84 matching lines @@
   VerifyAndClearObserverCounts(0, 0, 0, 1);
 
   // Make sure the resulting order matches.
   FolderNode* other_folder_node =
       model_->GetFolderNodeForBookmarkNode(bookmark_model()->other_node());
   ASSERT_EQ(3, other_folder_node->GetChildCount());
   EXPECT_TRUE(other_folder_node->GetChild(0)->GetTitle() == L"a1");
   EXPECT_TRUE(other_folder_node->GetChild(1)->GetTitle() == L"f2");
   EXPECT_TRUE(other_folder_node->GetChild(2)->GetTitle() == L"g1");
 }