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

chrome/browser/autocomplete/history_contents_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/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/history_contents_provider.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"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace {
 
 struct TestEntry {
   const char* url;
   const wchar_t* title;
   const wchar_t* body;
 } test_entries[] = {
   {"http://www.google.com/1", L"PAGEONE 1",   L"FOO some body text"},
   {"http://www.google.com/2", L"PAGEONE 2",   L"FOO some more blah blah"},
   {"http://www.google.com/3", L"PAGETHREE 3", L"BAR some hello world for you"},
 };
 
 class HistoryContentsProviderTest : public testing::Test,
                                     public ACProviderListener {
  public:
+  HistoryContentsProviderTest()
+      : ui_thread_(ChromeThread::UI, &message_loop_),
+        file_thread_(ChromeThread::FILE, &message_loop_) {}
 
   void RunQuery(const AutocompleteInput& input,
                 bool minimal_changes) {
     provider_->Start(input, minimal_changes);
 
     // When we're waiting for asynchronous messages, we have to spin the message
     // loop. This will be exited in the OnProviderUpdate function when complete.
     if (!input.synchronous_only())
       MessageLoop::current()->Run();
   }
@@ skipping 38 matching lines @@
     profile_.reset(NULL);
   }
 
   // ACProviderListener
   virtual void OnProviderUpdate(bool updated_matches) {
     // When we quit, the test will get back control.
     MessageLoop::current()->Quit();
   }
 
   MessageLoopForUI message_loop_;
+  ChromeThread ui_thread_;
+  ChromeThread file_thread_;
 
   std::wstring history_dir_;
 
   scoped_ptr<TestingProfile> profile_;
   scoped_refptr<HistoryContentsProvider> provider_;
 };
 
 TEST_F(HistoryContentsProviderTest, Body) {
   AutocompleteInput input(L"FOO", std::wstring(), true, false, false);
   RunQuery(input, false);
@@ skipping 75 matching lines @@
   ASSERT_EQ(2U, m3.size());
   if (bookmark_url == m3[0].destination_url) {
     EXPECT_EQ("http://www.google.com/3", m3[1].destination_url.spec());
   } else {
     EXPECT_EQ(bookmark_url, m3[1].destination_url);
     EXPECT_EQ("http://www.google.com/3", m3[0].destination_url.spec());
   }
 }
 
 }  // namespace