Turn on the History Quick Provider by Default

chrome/browser/autocomplete/history_contents_provider.cc

 // Copyright (c) 2011 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_contents_provider.h"
 
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 184 matching lines @@
   size_t max_for_provider = std::min(kMaxMatches, result_refs.size());
   std::partial_sort(result_refs.begin(), result_refs.begin() + max_for_provider,
                     result_refs.end(), &CompareMatchRelevance);
   matches_.clear();
   for (size_t i = 0; i < max_for_provider; i++) {
     matches_.push_back(ResultToMatch(*result_refs[i].result,
                                      result_refs[i].relevance));
   }
 }
 
-static bool MatchInTitle(const history::URLResult& result) {
-  return !result.title_match_positions().empty();
+// TODO(mrossetti): Remove MatchInTitle once body_only_ becomes permanent.
+bool HistoryContentsProvider::MatchInTitle(const history::URLResult& result) {
+  return !body_only_ && !result.title_match_positions().empty();
 }
 
 AutocompleteMatch HistoryContentsProvider::ResultToMatch(
     const history::URLResult& result,
     int score) {
-  // TODO(sky): if matched title highlight matching words in title.
-  // Also show star in popup.
   AutocompleteMatch match(this, score, true, MatchInTitle(result) ?
       AutocompleteMatch::HISTORY_TITLE : AutocompleteMatch::HISTORY_BODY);
   match.contents = StringForURLDisplay(result.url(), true, trim_http_);
   match.fill_into_edit =
       AutocompleteInput::FormattedStringWithEquivalentMeaning(result.url(),
                                                               match.contents);
   match.destination_url = result.url();
   match.contents_class.push_back(
       ACMatchClassification(0, ACMatchClassification::URL));
   match.description = result.title();
@@ skipping 56 matching lines @@
   UMA_HISTOGRAM_TIMES("Omnibox.QueryBookmarksTime",
                       TimeTicks::Now() - start_time);
 }
 
 void HistoryContentsProvider::AddBookmarkTitleMatchToResults(
     const bookmark_utils::TitleMatch& match) {
   history::URLResult url_result(match.node->GetURL(), match.match_positions);
   url_result.set_title(match.node->GetTitle());
   results_.AppendURLBySwapping(&url_result);
 }