Omnibox: Make the Controller Reorder Matches for Inlining

chrome/browser/autocomplete/shortcuts_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/shortcuts_provider.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <functional>
@@ skipping 236 matching lines @@
       for_each(expected_urls.begin(), expected_urls.end(),
                SetShouldContain(ac_matches_)).Leftovers();
   EXPECT_EQ(0U, Leftovers.size());
 
   // See if we got the expected top scorer.
   if (!ac_matches_.empty()) {
     std::partial_sort(ac_matches_.begin(), ac_matches_.begin() + 1,
                       ac_matches_.end(), AutocompleteMatch::MoreRelevant);
     EXPECT_EQ(expected_top_result, ac_matches_[0].destination_url.spec());
   }
+
+  // No shortcuts matches are allowed to be inlined no matter how highly
+  // they score.
+  for (ACMatches::const_iterator it = ac_matches_.begin();
+       it != ac_matches_.end(); ++it)
+    EXPECT_FALSE(it->allowed_to_be_default_match);
 }
 
 TEST_F(ShortcutsProviderTest, SimpleSingleMatch) {
   string16 text(ASCIIToUTF16("go"));
   std::string expected_url("http://www.google.com/");
   std::vector<std::string> expected_urls;
   expected_urls.push_back(expected_url);
   RunTest(text, expected_urls, expected_url);
 }
 
@@ skipping 398 matching lines @@
 
   match.destination_url = GURL(shortcuts_to_test_delete[2].url);
   match.contents = ASCIIToUTF16(shortcuts_to_test_delete[2].contents);
   match.description = ASCIIToUTF16(shortcuts_to_test_delete[2].description);
 
   provider_->DeleteMatch(match);
   EXPECT_EQ(original_shortcuts_count, backend_->shortcuts_map().size());
   EXPECT_TRUE(backend_->shortcuts_map().end() ==
               backend_->shortcuts_map().find(ASCIIToUTF16("delete")));
 }