Refactoring, moving and renaming the NetworkActionPredictor.

chrome/browser/prerender/prerender_histograms.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/prerender/prerender_histograms.h"
 
 #include <string>
 
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/stringprintf.h"
-#include "chrome/browser/autocomplete/network_action_predictor.h"
+#include "chrome/browser/predictors/autocomplete_action_predictor.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_util.h"
 
+using predictors::AutocompleteActionPredictor;
+
 namespace prerender {
 
 namespace {
 
 // Time window for which we will record windowed PLT's from the last
 // observed link rel=prefetch tag.
 const int kWindowDurationSeconds = 30;
 
 std::string ComposeHistogramName(const std::string& prefix_type,
                                  const std::string& name) {
@@ skipping 14 matching lines @@
                                 name);
   }
 
   if (experiment_id != kNoExperiment)
     return ComposeHistogramName("wash", name);
 
   switch (origin) {
     case ORIGIN_OMNIBOX:
       return ComposeHistogramName(
           StringPrintf("omnibox_%.1f",
-                       NetworkActionPredictor::get_hit_weight()).c_str(),
+                       AutocompleteActionPredictor::get_hit_weight()).c_str(),
           name);
     case ORIGIN_LINK_REL_PRERENDER:
       return ComposeHistogramName("web", name);
     case ORIGIN_GWS_PRERENDER:  // Handled above.
     default:
       NOTREACHED();
       break;
   };
 
   // Dummy return value to make the compiler happy.
@@ skipping 84 matching lines @@
   // always be in a window in the 30 seconds from each occurrence.
   last_prerender_seen_time_ = GetCurrentTimeTicks();
   seen_any_pageload_ = false;
   seen_pageload_started_after_prerender_ = false;
 }
 
 void PrerenderHistograms::RecordPrerenderStarted(Origin origin) const {
   if (OriginIsOmnibox(origin)) {
     UMA_HISTOGRAM_COUNTS(
         StringPrintf("Prerender.OmniboxPrerenderCount_%.1f%s",
-                     NetworkActionPredictor::get_hit_weight(),
+                     AutocompleteActionPredictor::get_hit_weight(),
                      PrerenderManager::GetModeString()).c_str(),
         1);
   }
 }
 
 void PrerenderHistograms::RecordUsedPrerender(Origin origin) const {
   if (OriginIsOmnibox(origin)) {
     UMA_HISTOGRAM_COUNTS(
         StringPrintf("Prerender.OmniboxNavigationsUsedPrerenderCount_%.1f%s",
-                     NetworkActionPredictor::get_hit_weight(),
+                     AutocompleteActionPredictor::get_hit_weight(),
                      PrerenderManager::GetModeString()).c_str(),
         1);
   }
 }
 
 base::TimeTicks PrerenderHistograms::GetCurrentTimeTicks() const {
   return base::TimeTicks::Now();
 }
 
 // Helper macro for histograms.
@@ skipping 162 matching lines @@
   return last_origin_;
 }
 
 bool PrerenderHistograms::IsOriginExperimentWash() const {
   if (!WithinWindow())
     return false;
   return origin_experiment_wash_;
 }
 
 }  // namespace prerender