[AiS] Use top local result for prefetch.

chrome/browser/autocomplete/search_provider_unittest.cc

Index: chrome/browser/autocomplete/search_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index abb7e7041efe79f8a3668d688f80c0355e61723b..fa7dc6c204029ed0c6181529f7ea20655115c1f6 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -3409,14 +3409,21 @@ TEST_F(SearchProviderTest, AnswersCache) {
   provider_->RegisterDisplayedAnswers(result);
   ASSERT_FALSE(provider_->answers_cache_.empty());
 
-  // Test that DoAnswersQuery retrieves data from cache.
-  AutocompleteInput input(base::ASCIIToUTF16("weather l"),
-                          base::string16::npos, base::string16(), GURL(),
-                          metrics::OmniboxEventProto::INVALID_SPEC, false,
-                          false, true, true,
-                          ChromeAutocompleteSchemeClassifier(&profile_));
-  provider_->DoAnswersQuery(input);
-  EXPECT_EQ(base::ASCIIToUTF16("weather los angeles"),
-            provider_->prefetch_data_.full_query_text);
-  EXPECT_EQ(base::ASCIIToUTF16("2334"), provider_->prefetch_data_.query_type);
+  // Without scored results, no answers will be retrieved.
+  AnswersQueryData answer =
+      provider_->FindAnswersPrefetchData(base::ASCIIToUTF16("weather l"));
+  EXPECT_TRUE(answer.full_query_text.empty());
+  EXPECT_TRUE(answer.query_type.empty());
+
+  // Inject a scored result, which will trigger answer retrieval.
+  base::string16 query = base::ASCIIToUTF16("weather los angeles");
+  SearchSuggestionParser::SuggestResult suggest_result(
+      query, AutocompleteMatchType::SEARCH_HISTORY, query, base::string16(),
+      base::string16(), base::string16(), base::string16(), std::string(),
+      std::string(), false, 1200, true, false, query);

[Mark P, 2014/09/16 22:24:55]

Not done.  It looks like the third to last parameter is still true.

[groby-ooo-7-16, 2014/09/18 23:27:24]

Done.

+  QueryForInput(ASCIIToUTF16("weather l"), false, false);
+  provider_->transformed_default_history_results_.push_back(suggest_result);
+  answer = provider_->FindAnswersPrefetchData(base::ASCIIToUTF16("weather l"));
+  EXPECT_EQ(base::ASCIIToUTF16("weather los angeles"), answer.full_query_text);
+  EXPECT_EQ(base::ASCIIToUTF16("2334"), answer.query_type);
 }