Omnibox: Make the Controller Reorder Matches for Inlining

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 270 matching lines @@
        ++actual, ++expected, ++i) {
     EXPECT_EQ(*expected, actual->destination_url.spec())
         << "For result #" << i << " we got '" << actual->destination_url.spec()
         << "' but expected '" << *expected << "'.";
     EXPECT_LT(actual->relevance, best_score)
       << "At result #" << i << " (url=" << actual->destination_url.spec()
       << "), we noticed scores are not monotonically decreasing.";
     best_score = actual->relevance;
   }
 
+  EXPECT_EQ(can_inline_top_result, ac_matches_[0].allowed_to_be_default_match);
   if (can_inline_top_result) {
     // When the top scorer is inline-able make sure we get the expected
     // fill_into_edit and autocomplete offset.
     EXPECT_EQ(expected_fill_into_edit, ac_matches_[0].fill_into_edit)
         << "fill_into_edit was: '" << ac_matches_[0].fill_into_edit
         << "' but we expected '" << expected_fill_into_edit << "'.";
     size_t text_pos = expected_fill_into_edit.find(text);
     ASSERT_NE(string16::npos, text_pos);
     EXPECT_EQ(ac_matches_[0].fill_into_edit.substr(text_pos + text.size()),
               ac_matches_[0].inline_autocompletion);
   } else {
     // When the top scorer is not inline-able autocomplete offset must be npos.
     EXPECT_TRUE(ac_matches_[0].inline_autocompletion.empty());
     // Also, the score must be too low to be inlineable.
+    // TODO(mpearson): when the controller reorders for inlining, there's no
+    // longer any connection between scores and what's inlineable / allowed
+    // to be the default match.  Remove this test.
     EXPECT_LT(ac_matches_[0].relevance,
               AutocompleteResult::kLowestDefaultScore);
   }
 }
 
 TEST_F(HistoryQuickProviderTest, SimpleSingleMatch) {
   std::vector<std::string> expected_urls;
   expected_urls.push_back("http://slashdot.org/favorite_page.html");
   RunTest(ASCIIToUTF16("slashdot"), expected_urls, true,
           ASCIIToUTF16("slashdot.org/favorite_page.html"));
@@ skipping 307 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"));
 }