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

chrome/browser/browser_commands_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 "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/browser_with_test_window_test.h"
 #include "chrome/test/testing_profile.h"
 
 typedef BrowserWithTestWindowTest BrowserCommandsTest;
 
 // Tests IDC_SELECT_TAB_0, IDC_SELECT_NEXT_TAB, IDC_SELECT_PREVIOUS_TAB and
 // IDC_SELECT_LAST_TAB.
@@ skipping 52 matching lines @@
   NavigationController& controller =
       browser()->GetTabContentsAt(1)->controller();
   ASSERT_EQ(3, controller.entry_count());
   ASSERT_EQ(2, controller.GetCurrentEntryIndex());
   ASSERT_TRUE(url1 == controller.GetEntryAtIndex(0)->url());
   ASSERT_TRUE(url2 == controller.GetEntryAtIndex(1)->url());
   ASSERT_TRUE(url3 == controller.GetEntryAtIndex(2)->url());
 }
 
 TEST_F(BrowserCommandsTest, BookmarkCurrentPage) {
+  ChromeThread ui_loop(ChromeThread::UI, MessageLoop::current());
+  ChromeThread file_loop(ChromeThread::FILE, MessageLoop::current());
   // We use profile() here, since it's a TestingProfile.
   profile()->CreateBookmarkModel(true);
   profile()->BlockUntilBookmarkModelLoaded();
 
   // Navigate to a url.
   GURL url1("http://foo/1");
   AddTab(browser(), url1);
   browser()->OpenURL(url1, GURL(), CURRENT_TAB, PageTransition::TYPED);
 
   // TODO(beng): remove this once we can use TabContentses directly in testing
@@ skipping 67 matching lines @@
   ASSERT_EQ(3, browser()->selected_index());
   ASSERT_EQ(url1, browser()->GetSelectedTabContents()->GetURL());
 
   // Same thing again for forward.
   // TODO(brettw) bug 11055: see the comment above about why we need this.
   CommitPendingLoad(&browser()->GetSelectedTabContents()->controller());
   browser()->GoForward(NEW_FOREGROUND_TAB);
   ASSERT_EQ(4, browser()->selected_index());
   ASSERT_EQ(url2, browser()->GetSelectedTabContents()->GetURL());
 }