Omnibox - HQP - Frequency Scoring Bug Fix

chrome/browser/autocomplete/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/autocomplete/scored_history_match.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 567 matching lines @@
   // Compute the weighted average |value_of_transition| over the last at
   // most kMaxVisitsToScore visits, where each visit is weighted using
   // GetRecencyScore() based on how many days ago it happened.  Use
   // kMaxVisitsToScore as the denominator for the average regardless of
   // how many visits there were in order to penalize a match that has
   // fewer visits than kMaxVisitsToScore.
   float summed_visit_points = 0;
   const size_t max_visit_to_score =
       std::min(visits.size(), ScoredHistoryMatch::kMaxVisitsToScore);
   for (size_t i = 0; i < max_visit_to_score; ++i) {
-    const bool typed_visit = fix_frequency_bugs_ ?
-        (visits[i].second & ui::PAGE_TRANSITION_TYPED) :
-        (visits[i].second == ui::PAGE_TRANSITION_TYPED);
-    int value_of_transition = typed_visit ? 20 : 1;
+    const ui::PageTransition page_transition = fix_frequency_bugs_ ?
+      ui::PageTransitionStripQualifier(visits[i].second) : visits[i].second;
+    int value_of_transition =
+        (page_transition == ui::PAGE_TRANSITION_TYPED) ? 20 : 1;
     if (bookmarked)
       value_of_transition = std::max(value_of_transition, bookmark_value_);
     const float bucket_weight =
         GetRecencyScore((now - visits[i].first).InDays());
     summed_visit_points += (value_of_transition * bucket_weight);
   }
   if (fix_frequency_bugs_)
     return summed_visit_points / ScoredHistoryMatch::kMaxVisitsToScore;
   return visits.size() * summed_visit_points /
       ScoredHistoryMatch::kMaxVisitsToScore;
@@ skipping 103 matching lines @@
           base::StringToDouble(it->first, &bucket.first);
       DCHECK(is_valid_intermediate_score);
       bool is_valid_hqp_score = base::StringToInt(it->second, &bucket.second);
       DCHECK(is_valid_hqp_score);
       hqp_buckets->push_back(bucket);
     }
     return true;
   }
   return false;
 }