Move autofill related WebView{Delegate} methods into the WebKit API....

chrome/browser/autofill_manager.cc

 // Copyright (c) 2006-2008 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/autofill_manager.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "webkit/glue/autofill_form.h"
 
 // Limit on the number of suggestions to appear in the pop-up menu under an
 // text input element in a form.
 static const int kMaxAutofillMenuItems = 6;
 
 // static
 void AutofillManager::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kFormAutofillEnabled, true);
 }
 
 AutofillManager::AutofillManager(TabContents* tab_contents)
     : tab_contents_(tab_contents),
       pending_query_handle_(0),
-      request_id_(0) {
+      query_id_(0) {
   form_autofill_enabled_.Init(prefs::kFormAutofillEnabled,
       profile()->GetPrefs(), NULL);
 }
 
 AutofillManager::~AutofillManager() {
   CancelPendingQuery();
 }
 
 void AutofillManager::CancelPendingQuery() {
   if (pending_query_handle_) {
@@ skipping 11 matching lines @@
 
 Profile* AutofillManager::profile() {
   return tab_contents_->profile();
 }
 
 void AutofillManager::AutofillFormSubmitted(
     const webkit_glue::AutofillForm& form) {
   StoreFormEntriesInWebDatabase(form);
 }
 
-bool AutofillManager::GetAutofillSuggestions(int request_id,
-                                             const std::wstring& name,
-                                             const std::wstring& prefix) {
+bool AutofillManager::GetAutofillSuggestions(int query_id,
+                                             const string16& name,
+                                             const string16& prefix) {
   if (!*form_autofill_enabled_)
     return false;
 
   WebDataService* web_data_service =
       profile()->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!web_data_service) {
     NOTREACHED();
     return false;
   }
 
   CancelPendingQuery();
 
-  request_id_ = request_id;
+  query_id_ = query_id;
 
   pending_query_handle_ = web_data_service->GetFormValuesForElementName(
       name, prefix, kMaxAutofillMenuItems, this);
   return true;
 }
 
-void AutofillManager::RemoveAutofillEntry(const std::wstring& name,
-                                          const std::wstring& value) {
+void AutofillManager::RemoveAutofillEntry(const string16& name,
+                                          const string16& value) {
   WebDataService* web_data_service =
       profile()->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!web_data_service) {
     NOTREACHED();
     return;
   }
 
   web_data_service->RemoveFormValueForElementName(name, value);
 }
 
@@ skipping 21 matching lines @@
   profile()->GetWebDataService(Profile::EXPLICIT_ACCESS)->
       AddAutofillFormElements(form.elements);
 }
 
 void AutofillManager::SendSuggestions(const WDTypedResult* result) {
   RenderViewHost* host = tab_contents_->render_view_host();
   if (!host)
     return;
   if (result) {
     DCHECK(result->GetType() == AUTOFILL_VALUE_RESULT);
-    const WDResult<std::vector<std::wstring> >* autofill_result =
-        static_cast<const WDResult<std::vector<std::wstring> >*>(result);
+    const WDResult<std::vector<string16> >* autofill_result =
+        static_cast<const WDResult<std::vector<string16> >*>(result);
     host->AutofillSuggestionsReturned(
-        request_id_, autofill_result->GetValue(), -1);
+        query_id_, autofill_result->GetValue(), -1);
   } else {
     host->AutofillSuggestionsReturned(
-        request_id_, std::vector<std::wstring>(), -1);
+        query_id_, std::vector<string16>(), -1);
   }
 }