Refactoring, moving and renaming the NetworkActionPredictor.

chrome/browser/autocomplete/autocomplete_edit.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/autocomplete_edit.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
-#include "chrome/browser/autocomplete/network_action_predictor.h"
-#include "chrome/browser/autocomplete/network_action_predictor_factory.h"
 #include "chrome/browser/autocomplete/search_provider.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_omnibox_api.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/url_fixer_upper.h"
+#include "chrome/browser/predictors/autocomplete_action_predictor.h"
+#include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using content::UserMetricsAction;
+using predictors::AutocompleteActionPredictor;
+using predictors::AutocompleteActionPredictorFactory;
 
 ///////////////////////////////////////////////////////////////////////////////
 // AutocompleteEditController
 
 AutocompleteEditController::~AutocompleteEditController() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // AutocompleteEditModel::State
 
@@ skipping 153 matching lines @@
   return InstantController::CommitIfCurrent(controller_->GetInstant());
 }
 
 void AutocompleteEditModel::OnChanged() {
   // Don't call CurrentMatch() when there's no editing, as in this case we'll
   // never actually use it.  This avoids running the autocomplete providers (and
   // any systems they then spin up) during startup.
   const AutocompleteMatch& current_match = user_input_in_progress_ ?
       CurrentMatch() : AutocompleteMatch();
 
-  NetworkActionPredictor::Action recommended_action =
-      NetworkActionPredictor::ACTION_NONE;
-  NetworkActionPredictor* network_action_predictor =
+  AutocompleteActionPredictor::Action recommended_action =
+      AutocompleteActionPredictor::ACTION_NONE;
+  AutocompleteActionPredictor* action_predictor =
       user_input_in_progress_ ?
-      NetworkActionPredictorFactory::GetForProfile(profile_) : NULL;
-  if (network_action_predictor) {
-    network_action_predictor->RegisterTransitionalMatches(user_text_,
-                                                          result());
-    // Confer with the NetworkActionPredictor to determine what action, if any,
-    // we should take. Get the recommended action here even if we don't need it
-    // so we can get stats for anyone who is opted in to UMA, but only get it if
-    // the user has actually typed something to avoid constructing it before
-    // it's needed. Note: This event is triggered as part of startup when the
-    // initial tab transitions to the start page.
+      AutocompleteActionPredictorFactory::GetForProfile(profile_) : NULL;
+  if (action_predictor) {
+    action_predictor->RegisterTransitionalMatches(user_text_, result());
+    // Confer with the AutocompleteActionPredictor to determine what action, if
+    // any, we should take. Get the recommended action here even if we don't
+    // need it so we can get stats for anyone who is opted in to UMA, but only
+    // get it if the user has actually typed something to avoid constructing it
+    // before it's needed. Note: This event is triggered as part of startup when
+    // the initial tab transitions to the start page.
     recommended_action =
-        network_action_predictor->RecommendAction(user_text_, current_match);
+        action_predictor->RecommendAction(user_text_, current_match);
   }
 
-  UMA_HISTOGRAM_ENUMERATION("NetworkActionPredictor.Action", recommended_action,
-                            NetworkActionPredictor::LAST_PREDICT_ACTION);
+  UMA_HISTOGRAM_ENUMERATION("AutocompleteActionPredictor.Action",
+                            recommended_action,
+                            AutocompleteActionPredictor::LAST_PREDICT_ACTION);
   string16 suggested_text;
 
   if (DoInstant(current_match, &suggested_text)) {
     SetSuggestedText(suggested_text, instant_complete_behavior_);
   } else {
     switch (recommended_action) {
-      case NetworkActionPredictor::ACTION_PRERENDER:
+      case AutocompleteActionPredictor::ACTION_PRERENDER:
         DoPrerender(current_match);
         break;
-      case NetworkActionPredictor::ACTION_PRECONNECT:
+      case AutocompleteActionPredictor::ACTION_PRECONNECT:
         DoPreconnect(current_match);
         break;
-      case NetworkActionPredictor::ACTION_NONE:
+      case AutocompleteActionPredictor::ACTION_NONE:
         break;
       default:
         NOTREACHED() << "Unexpected recommended action: " << recommended_action;
         break;
     }
 
     // Hide any suggestions we might be showing.
     view_->SetInstantSuggestion(string16(), false);
 
     // No need to wait any longer for instant.
@@ skipping 136 matching lines @@
 void AutocompleteEditModel::Revert() {
   SetInputInProgress(false);
   paste_state_ = NONE;
   InternalSetUserText(string16());
   keyword_.clear();
   is_keyword_hint_ = false;
   has_temporary_text_ = false;
   view_->SetWindowTextAndCaretPos(permanent_text_,
                                   has_focus_ ? permanent_text_.length() : 0,
                                   false, true);
-  NetworkActionPredictor* network_action_predictor =
-      NetworkActionPredictorFactory::GetForProfile(profile_);
-  if (network_action_predictor)
-    network_action_predictor->ClearTransitionalMatches();
+  AutocompleteActionPredictor* action_predictor =
+      AutocompleteActionPredictorFactory::GetForProfile(profile_);
+  if (action_predictor)
+    action_predictor->ClearTransitionalMatches();
 }
 
 void AutocompleteEditModel::StartAutocomplete(
     bool has_selected_text,
     bool prevent_inline_autocomplete) const {
   ClearPopupKeywordMode();
 
   bool keyword_is_selected = KeywordIsSelected();
   popup_->SetHoveredLine(AutocompletePopupModel::kNoMatch);
   // We don't explicitly clear AutocompletePopupModel::manually_selected_match,
@@ skipping 688 matching lines @@
 }
 
 void AutocompleteEditModel::DoPreconnect(const AutocompleteMatch& match) {
   if (!match.destination_url.SchemeIs(chrome::kExtensionScheme)) {
     // Warm up DNS Prefetch cache, or preconnect to a search service.
     UMA_HISTOGRAM_ENUMERATION("Autocomplete.MatchType", match.type,
                               AutocompleteMatch::NUM_TYPES);
     if (profile_->GetNetworkPredictor()) {
       profile_->GetNetworkPredictor()->AnticipateOmniboxUrl(
           match.destination_url,
-          NetworkActionPredictor::IsPreconnectable(match));
+          AutocompleteActionPredictor::IsPreconnectable(match));
     }
     // We could prefetch the alternate nav URL, if any, but because there
     // can be many of these as a user types an initial series of characters,
     // the OS DNS cache could suffer eviction problems for minimal gain.
   }
 }
 
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }