Modifying prefetch to account for multi-profile.

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/search_provider.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_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"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.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"
@@ skipping 811 matching lines @@
     if (match != result.end()) {
       if ((match->inline_autocomplete_offset != string16::npos) &&
           (match->inline_autocomplete_offset <
            match->fill_into_edit.length())) {
         inline_autocomplete_text =
             match->fill_into_edit.substr(match->inline_autocomplete_offset);
       }
 
       if (!match->destination_url.SchemeIs(chrome::kExtensionScheme)) {
         // Warm up DNS Prefetch cache, or preconnect to a search service.
-        chrome_browser_net::AnticipateOmniboxUrl(match->destination_url,
-                                                 IsPreconnectable(match->type));
+        if (profile_->GetNetworkPredictor())

[willchan no longer on Chromium, 2011/08/12 21:51:47]

Nit: please use braces for multiline if statements.

[rpetterson, 2011/08/13 00:55:17]

Done.

+          profile_->GetNetworkPredictor()->AnticipateOmniboxUrl(
+              match->destination_url,
+              IsPreconnectable(match->type));
       }
 
       // 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.
 
       is_keyword_hint = popup_->GetKeywordForMatch(*match, &keyword);
     }
     popup_->OnResultChanged();
     OnPopupDataChanged(inline_autocomplete_text, NULL, keyword,
@@ skipping 144 matching lines @@
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }