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

chrome/browser/autocomplete/history_url_provider_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/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 
@@ skipping 66 matching lines @@
   {"http://www.17173.com/", L"Domain with number", 3, 3, false},
 
   // URLs to test exact-matching behavior.
   {"http://go/", L"Intranet URL", 1, 1, false},
   {"http://gooey/", L"Intranet URL 2", 5, 5, false},
 
 };
 
 class HistoryURLProviderTest : public testing::Test,
                                public ACProviderListener {
+ public:
+  HistoryURLProviderTest()
+      : ui_thread_(ChromeThread::UI, &message_loop_),
+        file_thread_(ChromeThread::FILE, &message_loop_) {}
+
   // ACProviderListener
   virtual void OnProviderUpdate(bool updated_matches);
 
  protected:
   // testing::Test
   virtual void SetUp();
   virtual void TearDown();
 
   // Fills test data into the history system
   void FillData();
 
   // Runs an autocomplete query on |text| and checks to see that the returned
   // results' destination URLs match those provided.
   void RunTest(const std::wstring text,
                const std::wstring& desired_tld,
                bool prevent_inline_autocomplete,
                const std::string* expected_urls,
                size_t num_results);
 
   MessageLoopForUI message_loop_;
+  ChromeThread ui_thread_;
+  ChromeThread file_thread_;
   ACMatches matches_;
   scoped_ptr<TestingProfile> profile_;
   HistoryService* history_service_;
 
  private:
   scoped_refptr<HistoryURLProvider> autocomplete_;
 };
 
 void HistoryURLProviderTest::OnProviderUpdate(bool updated_matches) {
   if (autocomplete_->done())
     MessageLoop::current()->Quit();
 }
 
 void HistoryURLProviderTest::SetUp() {
   profile_.reset(new TestingProfile());
   profile_->CreateBookmarkModel(true);
+  profile_->BlockUntilBookmarkModelLoaded();
   profile_->CreateHistoryService(true);
   history_service_ = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
 
   autocomplete_ = new HistoryURLProvider(this, profile_.get());
 
   FillData();
 }
 
 void HistoryURLProviderTest::TearDown() {
   autocomplete_ = NULL;
@@ skipping 225 matching lines @@
 
   // An input looks like a IP address like "127.0.0.1" should result in
   // "http://127.0.0.1/".
   std::string fixup_4[] = {"http://127.0.0.1/"};
   RunTest(L"127.0.0.1", std::wstring(), false, fixup_4, arraysize(fixup_4));
 
   // An number "17173" should result in "http://www.17173.com/" in db.
   std::string fixup_5[] = {"http://www.17173.com/"};
   RunTest(L"17173", std::wstring(), false, fixup_5, arraysize(fixup_5));
 }