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

chrome/browser/bookmarks/bookmark_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 <set>
 
 #include "app/tree_node_iterator.h"
 #include "app/tree_node_model.h"
 #include "base/hash_tables.h"
 #include "base/string_util.h"
@@ skipping 544 matching lines @@
     }
   }
 }
 
 }  // namespace
 
 // Test class that creates a BookmarkModel with a real history backend.
 class BookmarkModelTestWithProfile : public testing::Test,
                                      public BookmarkModelObserver {
  public:
+  BookmarkModelTestWithProfile()
+      : ui_thread_(ChromeThread::UI, &message_loop_),
+        file_thread_(ChromeThread::FILE, &message_loop_) {}
+
   virtual void SetUp() {
   }
 
   virtual void TearDown() {
     profile_.reset(NULL);
   }
 
   // The profile.
   scoped_ptr<TestingProfile> profile_;
 
@@ skipping 70 matching lines @@
                                    int old_index,
                                    const BookmarkNode* node) {}
   virtual void BookmarkNodeChanged(BookmarkModel* model,
                                    const BookmarkNode* node) {}
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
                                              const BookmarkNode* node) {}
   virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
                                          const BookmarkNode* node) {}
 
   MessageLoopForUI message_loop_;
+  ChromeThread ui_thread_;
+  ChromeThread file_thread_;
 };
 
 // Creates a set of nodes in the bookmark bar model, then recreates the
 // bookmark bar model which triggers loading from the db and checks the loaded
 // structure to make sure it is what we first created.
 TEST_F(BookmarkModelTestWithProfile, CreateAndRestore) {
   struct TestData {
     // Structure of the children of the bookmark bar model node.
     const std::wstring bbn_contents;
     // Structure of the children of the other node.
@@ skipping 226 matching lines @@
   // Make sure we were notified.
   AssertObserverCount(0, 0, 0, 0, 1);
 
   // Make sure the order matches (remember, 'a' and 'C' are folders and
   // come first).
   EXPECT_TRUE(parent->GetChild(0)->GetTitle() == L"a");
   EXPECT_TRUE(parent->GetChild(1)->GetTitle() == L"C");
   EXPECT_TRUE(parent->GetChild(2)->GetTitle() == L"B");
   EXPECT_TRUE(parent->GetChild(3)->GetTitle() == L"d");
 }