autocomplete: Extract AutocompleteResult from autocomplete.*.

chrome/browser/predictors/autocomplete_action_predictor.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/predictors/autocomplete_action_predictor.h"
 
 #include <math.h>
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_log.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
+#include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
 #include "chrome/browser/predictors/predictor_database.h"
 #include "chrome/browser/predictors/predictor_database_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"
@@ skipping 102 matching lines @@
       std::find(transitional_matches_.begin(), transitional_matches_.end(),
                 lower_user_text);
 
   if (match_it == transitional_matches_.end()) {
     TransitionalMatch transitional_match;
     transitional_match.user_text = lower_user_text;
     match_it = transitional_matches_.insert(transitional_matches_.end(),
                                             transitional_match);
   }
 
-  for (AutocompleteResult::const_iterator it = result.begin();
-       it != result.end(); ++it) {
+  for (AutocompleteResult::const_iterator i(result.begin()); i != result.end();
+       ++i) {
     if (std::find(match_it->urls.begin(), match_it->urls.end(),
-                  it->destination_url) == match_it->urls.end()) {
-      match_it->urls.push_back(it->destination_url);
+                  i->destination_url) == match_it->urls.end()) {
+      match_it->urls.push_back(i->destination_url);
     }
   }
 }
 
 void AutocompleteActionPredictor::ClearTransitionalMatches() {
   transitional_matches_.clear();
 }
 
 // Given a match, return a recommended action.
 AutocompleteActionPredictor::Action
@@ skipping 392 matching lines @@
   return number_of_hits / (number_of_hits + value.number_of_misses);
 }
 
 AutocompleteActionPredictor::TransitionalMatch::TransitionalMatch() {
 }
 
 AutocompleteActionPredictor::TransitionalMatch::~TransitionalMatch() {
 }
 
 }  // namespace predictors