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

chrome/browser/autofill_manager.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_MANAGER_H_
 
 #include <string>
 
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
@@ skipping 12 matching lines @@
 class AutofillManager : public RenderViewHostDelegate::Autofill,
                         public WebDataServiceConsumer {
  public:
   explicit AutofillManager(TabContents* tab_contents);
   virtual ~AutofillManager();
 
   Profile* profile();
 
   // RenderViewHostDelegate::Autofill implementation.
   virtual void AutofillFormSubmitted(const webkit_glue::AutofillForm& form);
-  virtual bool GetAutofillSuggestions(int request_id,
-                                      const std::wstring& name,
-                                      const std::wstring& prefix);
-  virtual void RemoveAutofillEntry(const std::wstring& name,
-                                   const std::wstring& value);
+  virtual bool GetAutofillSuggestions(int query_id,
+                                      const string16& name,
+                                      const string16& prefix);
+  virtual void RemoveAutofillEntry(const string16& name,
+                                   const string16& value);
 
   // WebDataServiceConsumer implementation.
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result);
 
   static void RegisterUserPrefs(PrefService* prefs);
 
  private:
   void CancelPendingQuery();
   void StoreFormEntriesInWebDatabase(const webkit_glue::AutofillForm& form);
   void SendSuggestions(const WDTypedResult* suggestions);
 
   TabContents* tab_contents_;
 
   BooleanPrefMember form_autofill_enabled_;
 
   // When the manager makes a request from WebDataService, the database
   // is queried on another thread, we record the query handle until we
   // get called back.
   WebDataService::Handle pending_query_handle_;
-  int request_id_;
+  int query_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_MANAGER_H_