Omnibox Field Trial: Make HQP Score Bookmarks More Highly

chrome/browser/history/scored_history_match.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/history/scored_history_match.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 #include <numeric>
 #include <set>
 
 #include <math.h>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/autocomplete/url_prefix.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
+#include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace history {
 
 // ScoredHistoryMatch ----------------------------------------------------------
 
 bool ScoredHistoryMatch::initialized_ = false;
+int ScoredHistoryMatch::bookmark_value = -1;

[Peter Kasting, 2013/11/09 00:44:55]

Maybe this should be 1.

[Mark P, 2013/11/25 21:11:57]

Right you are.  Done.

 const size_t ScoredHistoryMatch::kMaxVisitsToScore = 10u;
 bool ScoredHistoryMatch::also_do_hup_like_scoring = false;
 int ScoredHistoryMatch::max_assigned_score_for_non_inlineable_matches = -1;
 
 ScoredHistoryMatch::ScoredHistoryMatch()
     : raw_score(0),
       can_inline(false) {
   if (!initialized_) {
     InitializeAlsoDoHUPLikeScoringFieldAndMaxScoreField();
+    InitializeBookmarkValue();
     initialized_ = true;
   }
 }
 
 ScoredHistoryMatch::ScoredHistoryMatch(const URLRow& row,
                                        const VisitInfoVector& visits,
                                        const std::string& languages,
                                        const string16& lower_string,
                                        const String16Vector& terms,
                                        const RowWordStarts& word_starts,
                                        const base::Time now,
                                        BookmarkService* bookmark_service)
     : HistoryMatch(row, 0, false, false),
       raw_score(0),
       can_inline(false) {
   if (!initialized_) {
     InitializeAlsoDoHUPLikeScoringFieldAndMaxScoreField();
+    InitializeBookmarkValue();
     initialized_ = true;
   }
 
   GURL gurl = row.url();
   if (!gurl.is_valid())
     return;
 
   // Figure out where each search term appears in the URL and/or page title
   // so that we can score as well as provide autocomplete highlighting.
   string16 url = CleanUpUrlForMatching(gurl, languages);
@@ skipping 458 matching lines @@
   // HUP-like-scoring, these results would actually come from the HUP
   // and not be demoted, thus outscoring the demoted HQP results.
   // When the HQP provides these, we need to clamp the non-inlineable
   // results to preserve this behavior.
   if (also_do_hup_like_scoring) {
     max_assigned_score_for_non_inlineable_matches =
         HistoryURLProvider::kScoreForBestInlineableResult - 1;
   }
 }
 
+void ScoredHistoryMatch::InitializeBookmarkValue() {
+  bookmark_value = OmniboxFieldTrial::HQPBookmarkValue();
+}
+
 }  // namespace history