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

chrome/browser/views/bookmark_context_menu_test.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 "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/views/bookmark_context_menu.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/test/testing_profile.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
@@ skipping 13 matching lines @@
   }
 
   std::vector<GURL> urls_;
 };
 
 }  // namespace
 
 class BookmarkContextMenuTest : public testing::Test {
  public:
   BookmarkContextMenuTest()
-      : model_(NULL) {
+      : ui_thread_(ChromeThread::UI, &message_loop_),
+        file_thread_(ChromeThread::FILE, &message_loop_),
+        model_(NULL) {
   }
 
   virtual void SetUp() {
 #if defined(OS_WIN)
     BookmarkBarView::testing_ = true;
 #endif
 
     profile_.reset(new TestingProfile());
     profile_->set_has_history_service(true);
     profile_->CreateBookmarkModel(true);
     profile_->BlockUntilBookmarkModelLoaded();
 
     model_ = profile_->GetBookmarkModel();
 
     AddTestData();
   }
 
   virtual void TearDown() {
 #if defined(OS_WIN)
     BookmarkBarView::testing_ = false;
 #endif
 
     // Flush the message loop to make Purify happy.
     message_loop_.RunAllPending();
   }
 
  protected:
   MessageLoopForUI message_loop_;
+  ChromeThread ui_thread_;
+  ChromeThread file_thread_;
   scoped_ptr<TestingProfile> profile_;
   BookmarkModel* model_;
   TestingPageNavigator navigator_;
 
  private:
   // Creates the following structure:
   // a
   // F1
   //  f1a
   //  F11
@@ skipping 209 matching lines @@
       controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
   EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
   EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOKMARK_BAR_REMOVE));
   EXPECT_FALSE(
       controller.IsCommandEnabled(IDS_BOOKMARK_MANAGER_SHOW_IN_FOLDER));
   EXPECT_FALSE(
       controller.IsCommandEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_FALSE(
       controller.IsCommandEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
 }