summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorrlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-10 01:30:46 +0000
committerrlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-10 01:30:46 +0000
commit67372ecfa788fa29193f94029f9eccac2c08af0f (patch)
treee99301edd0e3b874600d3fbcdede208e35adcbdb /chrome/browser/autocomplete
parent29adff69903acfae6aca00ba41b185d143f57f35 (diff)
downloadchromium_src-67372ecfa788fa29193f94029f9eccac2c08af0f.zip
chromium_src-67372ecfa788fa29193f94029f9eccac2c08af0f.tar.gz
chromium_src-67372ecfa788fa29193f94029f9eccac2c08af0f.tar.bz2
Modifying prefetch to account for multi-profile.
Items of note: - predictor_api is gone. Most functions in predictor_api.cc have moved into the chrome_browser_net::Predictor class or the Profile class. - The predictor state is cleaned up in the Profile dtor. - Predictor is owned by the ProfileIOData of the profile. - InitialObserver class is gone since each profile keeps their own info, the non-OTR don't care if anyone is OTR. - Predictor is created by the profile and then passed to the ProfileIOData. Then its initialization is finished on the IOThread. - ConnectInterceptor now subclasses off of UrlRequestJobFactory::Interceptor. - Updated Profile to create a SimpleShutdownPredictor with limited functionality when in unittests. BUG=89937,90114 TEST=passes existing Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=97446 Review URL: http://codereview.chromium.org/7467012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index b4950e8..8c4958e 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -22,7 +22,7 @@
#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_api.h"
+#include "chrome/browser/net/predictor.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/prerender/prerender_manager.h"
#include "chrome/browser/profiles/profile.h"
@@ -1035,8 +1035,11 @@ void AutocompleteEditModel::DoPreconnect(const AutocompleteMatch& match) {
// Warm up DNS Prefetch cache, or preconnect to a search service.
UMA_HISTOGRAM_ENUMERATION("Autocomplete.MatchType", match.type,
AutocompleteMatch::NUM_TYPES);
- chrome_browser_net::AnticipateOmniboxUrl(match.destination_url,
- NetworkActionPredictor::IsPreconnectable(match));
+ if (profile_->GetNetworkPredictor()) {
+ profile_->GetNetworkPredictor()->AnticipateOmniboxUrl(
+ match.destination_url,
+ NetworkActionPredictor::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.