Profiles: Move NetworkActionPredictor to the ProfileKeyedService framework.

chrome/browser/autocomplete/autocomplete_edit.cc

 // Copyright (c) 2011 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/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/prerender/prerender_field_trial.h"
 #include "chrome/browser/prerender/prerender_manager.h"
@@ skipping 178 matching lines @@
 
 bool AutocompleteEditModel::AcceptCurrentInstantPreview() {
   return InstantController::CommitIfCurrent(controller_->GetInstant());
 }
 
 void AutocompleteEditModel::OnChanged() {
   const AutocompleteMatch current_match = CurrentMatch();
 
   NetworkActionPredictor::Action recommended_action =
       NetworkActionPredictor::ACTION_NONE;
-  NetworkActionPredictor* network_action_predictor = user_input_in_progress() ?
-      profile_->GetNetworkActionPredictor() : NULL;
+  NetworkActionPredictor* network_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.
     recommended_action =
@@ skipping 164 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);
   NetworkActionPredictor* network_action_predictor =
-      profile_->GetNetworkActionPredictor();
+      NetworkActionPredictorFactory::GetForProfile(profile_);
   if (network_action_predictor)
     network_action_predictor->ClearTransitionalMatches();
 }
 
 void AutocompleteEditModel::StartAutocomplete(
     bool has_selected_text,
     bool prevent_inline_autocomplete) const {
   bool keyword_is_selected = KeywordIsSelected();
   popup_->SetHoveredLine(AutocompletePopupModel::kNoMatch);
   // We don't explicitly clear AutocompletePopupModel::manually_selected_match,
@@ skipping 667 matching lines @@
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }