Omnibox: Fixes Allow-To-Be-Default-Match Code for HistoryQuick Provider

chrome/browser/autocomplete/history_quick_provider.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 <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 259 matching lines @@
       AutocompleteInput::FormattedStringWithEquivalentMeaning(info.url(),
           net::FormatUrlWithOffsets(info.url(), languages_, format_types,
               net::UnescapeRule::SPACES, NULL, NULL, &offsets));
   history::TermMatches new_matches =
       ReplaceOffsetsInTermMatches(history_match.url_matches(), offsets);
   match.contents = net::FormatUrl(info.url(), languages_, format_types,
               net::UnescapeRule::SPACES, NULL, NULL, NULL);
   match.contents_class =
       SpansFromTermMatch(new_matches, match.contents.length(), true);
 
-  match.allowed_to_be_default_match = history_match.can_inline() &&
-      !PreventInlineAutocomplete(autocomplete_input_);
-  if (match.allowed_to_be_default_match) {
+  if (history_match.can_inline()) {
     DCHECK(!new_matches.empty());
     size_t inline_autocomplete_offset = new_matches[0].offset +
         new_matches[0].length;
     // |inline_autocomplete_offset| may be beyond the end of the
     // |fill_into_edit| if the user has typed an URL with a scheme and the
     // last character typed is a slash.  That slash is removed by the
     // FormatURLWithOffsets call above.
     if (inline_autocomplete_offset < match.fill_into_edit.length()) {
       match.inline_autocompletion =
           match.fill_into_edit.substr(inline_autocomplete_offset);
     }
+    match.allowed_to_be_default_match = match.inline_autocompletion.empty() ||
+        !PreventInlineAutocomplete(autocomplete_input_);
   }
 
   // Format the description autocomplete presentation.
   match.description = info.title();
   match.description_class = SpansFromTermMatch(
       history_match.title_matches(), match.description.length(), false);
 
   match.RecordAdditionalInfo("typed count", info.typed_count());
   match.RecordAdditionalInfo("visit count", info.visit_count());
   match.RecordAdditionalInfo("last visit", info.last_visit());
 
   return match;
 }
 
 history::InMemoryURLIndex* HistoryQuickProvider::GetIndex() {
   if (index_for_testing_.get())
     return index_for_testing_.get();
 
   HistoryService* const history_service =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (!history_service)
     return NULL;
 
   return history_service->InMemoryIndex();
 }