Change HistoryService::ScheduleAutocomplete interface

chrome/browser/autocomplete/history_url_provider.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/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 570 matching lines @@
     // field on it will be read by the second pass -- see comments in
     // DoAutocomplete().
   }
 
   // Pass 2: Ask the history service to call us back on the history thread,
   // where we can read the full on-disk DB.
   if (input.want_asynchronous_matches()) {
     done_ = false;
     params_ = params.release();  // This object will be destroyed in
                                  // QueryComplete() once we're done with it.
-    history_service->ScheduleAutocomplete(this, params_);
+    history_service->ScheduleAutocomplete(
+        base::Bind(&HistoryURLProvider::ExecuteWithDB, this, params_));
   }
 }
 
 void HistoryURLProvider::Stop(bool clear_cached_results) {
   done_ = true;
 
   if (params_)
     params_->cancel_flag.Set();
 }
 
@@ skipping 52 matching lines @@
           match.contents.length(), ACMatchClassification::URL,
           &match.contents_class);
     }
 
     match.is_history_what_you_typed_match = true;
   }
 
   return match;
 }
 
-void HistoryURLProvider::ExecuteWithDB(history::HistoryBackend* backend,
-                                       history::URLDatabase* db,
-                                       HistoryURLProviderParams* params) {
+void HistoryURLProvider::ExecuteWithDB(HistoryURLProviderParams* params,
+                                       history::HistoryBackend* backend,
+                                       history::URLDatabase* db) {
   // We may get called with a NULL database if it couldn't be properly
   // initialized.
   if (!db) {
     params->failed = true;
   } else if (!params->cancel_flag.IsSet()) {
     base::TimeTicks beginning_time = base::TimeTicks::Now();
 
     DoAutocomplete(backend, db, params);
 
     UMA_HISTOGRAM_TIMES("Autocomplete.HistoryAsyncQueryTime",
@@ skipping 521 matching lines @@
     AutocompleteMatch::ClassifyLocationInString(base::string16::npos, 0,
         match.contents.length(), ACMatchClassification::URL,
         &match.contents_class);
   }
   match.description = info.title();
   match.description_class =
       ClassifyDescription(params.input.text(), match.description);
   RecordAdditionalInfoFromUrlRow(info, &match);
   return match;
 }