Prefetch cache pt1 - MRU

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 1d6977e2ea90684fc663163d9c9abe9f0f3b0a80..c207f1fd829a78eb0762d668b81ed48eadc839cb 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -3230,9 +3230,6 @@ TEST_F(SearchProviderTest, SessionToken) {
 }
 
 TEST_F(SearchProviderTest, AnswersCache) {
-  // Initial condition: empty cache.
-  ASSERT_TRUE(provider_->last_answer_seen_.full_query_text.empty());
-
   AutocompleteResult result;
   ACMatches matches;
   AutocompleteMatch match1;
@@ -3248,10 +3245,7 @@ TEST_F(SearchProviderTest, AnswersCache) {
   matches.push_back(non_answer_match1);
   result.AppendMatches(matches);
   provider_->RegisterDisplayedAnswers(result);
-  EXPECT_EQ(base::ASCIIToUTF16("weather los angeles"),
-            provider_->last_answer_seen_.full_query_text);
-  EXPECT_EQ(base::ASCIIToUTF16("2334"),
-            provider_->last_answer_seen_.query_type);
+  ASSERT_FALSE(provider_->answers_cache_.IsEmpty());
 
   // Test that DoAnswersQuery retrieves data from cache.
   AutocompleteInput input(base::ASCIIToUTF16("weather l"),
@@ -3263,14 +3257,4 @@ TEST_F(SearchProviderTest, AnswersCache) {
   EXPECT_EQ(base::ASCIIToUTF16("weather los angeles"),
             provider_->prefetch_data_.full_query_text);
   EXPECT_EQ(base::ASCIIToUTF16("2334"), provider_->prefetch_data_.query_type);
-
-  // Mismatching input will return empty prefetch data.

[Peter Kasting, 2014/08/11 22:15:34]

I realize you mainly moved this test into the other unittest file, but is there
any part of it that should still be here, to test any other plumbing in
SearchProvider?

[groby-ooo-7-16, 2014/08/12 01:16:27]

This used to test the second branch of the ternary in DoAnswersQuery - at this
point, it'd only test that assigning an empty string results in an empty string
:)

So, no, I don't think this covers any logic.

-  AutocompleteInput input2(base::ASCIIToUTF16("weather n"),
-                           base::string16::npos, base::string16(), GURL(),
-                           metrics::OmniboxEventProto::INVALID_SPEC, false,
-                           false, true, true,
-                           ChromeAutocompleteSchemeClassifier(&profile_));
-  provider_->DoAnswersQuery(input2);
-  EXPECT_TRUE(provider_->prefetch_data_.full_query_text.empty());
-  EXPECT_TRUE(provider_->prefetch_data_.query_type.empty());
 }