Move Ownership of IMUI to HistoryService.

chrome/browser/autocomplete/history_quick_provider_unittest.cc

 // Copyright (c) 2012 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/autocomplete/history_quick_provider.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <string>
@@ skipping 81 matching lines @@
 
     void operator()(const std::string& expected);
 
     std::set<std::string> LeftOvers() const { return matches_; }
 
    private:
     std::set<std::string> matches_;
   };
 
   void SetUp();
-
-  void TearDown() {
-    provider_ = NULL;
-  }
+  void TearDown();
 
   virtual void GetTestData(size_t* data_count, TestURLInfo** test_data);
 
   // 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. |expected_urls| does not
   // need to be in sorted order.
   void RunTest(const string16 text,
@@ skipping 18 matching lines @@
   profile_.reset(new TestingProfile());
   profile_->CreateHistoryService(true, false);
   profile_->CreateBookmarkModel(true);
   profile_->BlockUntilBookmarkModelLoaded();
   history_service_ = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
   EXPECT_TRUE(history_service_);
   provider_ = new HistoryQuickProvider(this, profile_.get());
   FillData();
 }
 
+void HistoryQuickProviderTest::TearDown() {
+  provider_ = NULL;
+}
+
 void HistoryQuickProviderTest::OnProviderUpdate(bool updated_matches) {
   MessageLoop::current()->Quit();
 }
 
 void HistoryQuickProviderTest::GetTestData(size_t* data_count,
                                            TestURLInfo** test_data) {
   DCHECK(data_count);
   DCHECK(test_data);
   *data_count = arraysize(quick_test_db);
   *test_data = &quick_test_db[0];
 }
 
 void HistoryQuickProviderTest::FillData() {
   history::URLDatabase* db = history_service_->InMemoryDatabase();
   ASSERT_TRUE(db != NULL);
-
+#if 1
+// DO WE WANT THIS CHANGE?

[Peter Kasting, 2012/02/04 02:20:31]

?

[mrossetti, 2012/02/04 04:30:53]

I apologize. I thought I'd gotten all the conditionals. :(

+  history::InMemoryURLIndex* index = provider_->GetIndex();
+#else
+// CURRENT REPO
   history::InMemoryURLIndex* index =
       new history::InMemoryURLIndex(FilePath());
   PrefService* prefs = profile_->GetPrefs();
   std::string languages(prefs->GetString(prefs::kAcceptLanguages));
   index->Init(db, languages);
+#endif
   size_t data_count = 0;
   TestURLInfo* test_data = NULL;
   GetTestData(&data_count, &test_data);
   for (size_t i = 0; i < data_count; ++i) {
     const TestURLInfo& cur(test_data[i]);
     const GURL current_url(cur.url);
     Time visit_time = Time::Now() - TimeDelta::FromDays(cur.days_from_now);
 
     history::URLRow url_info(current_url);
+    url_info.set_id(i + 5000);
     url_info.set_title(UTF8ToUTF16(cur.title));
     url_info.set_visit_count(cur.visit_count);
     url_info.set_typed_count(cur.typed_count);
     url_info.set_last_visit(visit_time);
     url_info.set_hidden(false);
-    index->UpdateURL(i, url_info);
+    index->UpdateURL(url_info);
   }
-
-  provider_->set_index(index);
 }
 
 HistoryQuickProviderTest::SetShouldContain::SetShouldContain(
     const ACMatches& matched_urls) {
   for (ACMatches::const_iterator iter = matched_urls.begin();
        iter != matched_urls.end(); ++iter)
     matches_.insert(iter->destination_url.spec());
 }
 
 void HistoryQuickProviderTest::SetShouldContain::operator()(
@@ skipping 340 matching lines @@
 
 TEST_F(HQPOrderingTest, TEAMatch) {
   std::vector<std::string> expected_urls;
   expected_urls.push_back("http://www.teamliquid.net/");
   expected_urls.push_back("http://www.teamliquid.net/tlpd");
   expected_urls.push_back("http://www.teamliquid.net/tlpd/korean/players");
   RunTest(ASCIIToUTF16("tea"), expected_urls, true,
           ASCIIToUTF16("www.teamliquid.net"));
 }