Omnibox - Launch Change to Correctly Classify Typed Visits

components/omnibox/browser/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 "components/omnibox/browser/scored_history_match.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 90 matching lines @@
     }
   }
 }
 
 }  // namespace
 
 // static
 const size_t ScoredHistoryMatch::kMaxVisitsToScore = 10;
 bool ScoredHistoryMatch::also_do_hup_like_scoring_ = false;
 int ScoredHistoryMatch::bookmark_value_ = 1;
-bool ScoredHistoryMatch::fix_typed_visit_bug_ = false;
 bool ScoredHistoryMatch::fix_few_visits_bug_ = false;
 bool ScoredHistoryMatch::allow_tld_matches_ = false;
 bool ScoredHistoryMatch::allow_scheme_matches_ = false;
 size_t ScoredHistoryMatch::num_title_words_to_allow_ = 10u;
 bool ScoredHistoryMatch::hqp_experimental_scoring_enabled_ = false;
 float ScoredHistoryMatch::topicality_threshold_ = 0.8f;
 // Default HQP relevance buckets. See GetFinalRelevancyScore()
 // for more details on these numbers.
 char ScoredHistoryMatch::hqp_relevance_buckets_str_[] =
     "0.0:400,1.5:600,5.0:900,10.5:1203,15.0:1300,20.0:1399";
@@ skipping 300 matching lines @@
 // static
 void ScoredHistoryMatch::Init() {
   static bool initialized = false;
 
   if (initialized)
     return;
 
   initialized = true;
   also_do_hup_like_scoring_ = OmniboxFieldTrial::HQPAlsoDoHUPLikeScoring();
   bookmark_value_ = OmniboxFieldTrial::HQPBookmarkValue();
-  fix_typed_visit_bug_ = OmniboxFieldTrial::HQPFixTypedVisitBug();
   fix_few_visits_bug_ = OmniboxFieldTrial::HQPFixFewVisitsBug();
   allow_tld_matches_ = OmniboxFieldTrial::HQPAllowMatchInTLDValue();
   allow_scheme_matches_ = OmniboxFieldTrial::HQPAllowMatchInSchemeValue();
   num_title_words_to_allow_ = OmniboxFieldTrial::HQPNumTitleWordsToAllow();
 
   InitRawTermScoreToTopicalityScoreArray();
   InitDaysAgoToRecencyScoreArray();
   InitHQPExperimentalParams();
 }
 
@@ skipping 156 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 is_page_transition_typed =
-        fix_typed_visit_bug_ ? ui::PageTransitionCoreTypeIs(
-                                   visits[i].second, ui::PAGE_TRANSITION_TYPED)
-                             : ui::PageTransitionTypeIncludingQualifiersIs(
-                                   visits[i].second, ui::PAGE_TRANSITION_TYPED);
+    const bool is_page_transition_typed = ui::PageTransitionCoreTypeIs(
+        visits[i].second, ui::PAGE_TRANSITION_TYPED);
     int value_of_transition = is_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_few_visits_bug_)
     return summed_visit_points / ScoredHistoryMatch::kMaxVisitsToScore;
   return visits.size() * summed_visit_points /
@@ skipping 105 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;
 }