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

chrome/browser/webdata/web_database.cc

 // 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.
 
 #include "chrome/browser/webdata/web_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 832 matching lines @@
     int64* pair_id,
     int* count) {
   sql::Statement s(db_.GetUniqueStatement(
       "SELECT pair_id, count FROM autofill "
       "WHERE name = ? AND value = ?"));
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
 
-  s.BindString(0, WideToUTF8(element.name));
-  s.BindString(1, WideToUTF8(element.value));
+  s.BindString(0, UTF16ToUTF8(element.name));
+  s.BindString(1, UTF16ToUTF8(element.value));
 
   *count = 0;
 
   if (s.Step()) {
     *pair_id = s.ColumnInt64(0);
     *count = s.ColumnInt(1);
   }
 
   return true;
 }
@@ skipping 17 matching lines @@
 
 bool WebDatabase::InsertFormElement(const AutofillForm::Element& element,
                                     int64* pair_id) {
   sql::Statement s(db_.GetUniqueStatement(
       "INSERT INTO autofill (name, value, value_lower) VALUES (?,?,?)"));
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
 
-  s.BindString(0, WideToUTF8(element.name));
-  s.BindString(1, WideToUTF8(element.value));
-  s.BindString(2, UTF16ToUTF8(
-      l10n_util::ToLower(WideToUTF16Hack(element.value))));
+  s.BindString(0, UTF16ToUTF8(element.name));
+  s.BindString(1, UTF16ToUTF8(element.value));
+  s.BindString(2, UTF16ToUTF8(l10n_util::ToLower(element.value)));
 
   if (!s.Run()) {
     NOTREACHED();
     return false;
   }
 
   *pair_id = db_.GetLastInsertRowId();
   return true;
 }
 
@@ skipping 43 matching lines @@
   if (!GetIDAndCountOfFormElement(element, &pair_id, &count))
     return false;
 
   if (count == 0 && !InsertFormElement(element, &pair_id))
     return false;
 
   return SetCountOfFormElement(pair_id, count + 1) &&
       InsertPairIDAndDate(pair_id, Time::Now());
 }
 
-bool WebDatabase::GetFormValuesForElementName(const std::wstring& name,
-                                              const std::wstring& prefix,
-                                              std::vector<std::wstring>* values,
+bool WebDatabase::GetFormValuesForElementName(const string16& name,
+                                              const string16& prefix,
+                                              std::vector<string16>* values,
                                               int limit) {
   DCHECK(values);
   sql::Statement s;
 
   if (prefix.empty()) {
     s.Assign(db_.GetUniqueStatement(
         "SELECT value FROM autofill "
         "WHERE name = ? "
         "ORDER BY count DESC "
         "LIMIT ?"));
     if (!s) {
       NOTREACHED() << "Statement prepare failed";
       return false;
     }
 
-    s.BindString(0, WideToUTF8(name));
+    s.BindString(0, UTF16ToUTF8(name));
     s.BindInt(1, limit);
   } else {
-    string16 prefix_lower = l10n_util::ToLower(WideToUTF16Hack(prefix));
+    string16 prefix_lower = l10n_util::ToLower(prefix);
     string16 next_prefix = prefix_lower;
     next_prefix[next_prefix.length() - 1]++;
 
     s.Assign(db_.GetUniqueStatement(
         "SELECT value FROM autofill "
         "WHERE name = ? AND "
         "value_lower >= ? AND "
         "value_lower < ? "
         "ORDER BY count DESC "
         "LIMIT ?"));
     if (!s) {
       NOTREACHED() << "Statement prepare failed";
       return false;
     }
 
-    s.BindString(0, WideToUTF8(name));
+    s.BindString(0, UTF16ToUTF8(name));
     s.BindString(1, UTF16ToUTF8(prefix_lower));
     s.BindString(2, UTF16ToUTF8(next_prefix));
     s.BindInt(3, limit);
   }
 
   values->clear();
   while (s.Step())
-    values->push_back(UTF8ToWide(s.ColumnString(0)));
+    values->push_back(UTF8ToUTF16(s.ColumnString(0)));
   return s.Succeeded();
 }
 
 bool WebDatabase::RemoveFormElementsAddedBetween(base::Time delete_begin,
                                                  base::Time delete_end) {
   sql::Statement s(db_.GetUniqueStatement(
       "SELECT DISTINCT pair_id FROM autofill_dates "
       "WHERE date_created >= ? AND date_created < ?"));
   if (!s) {
     NOTREACHED() << "Statement 1 prepare failed";
@@ skipping 45 matching lines @@
   s.BindInt64(2, delete_end.is_null() ? std::numeric_limits<int64>::max() :
                                         delete_end.ToTimeT());
 
   bool result = s.Run();
   if (how_many)
     *how_many = db_.GetLastChangeCount();
 
   return result;
 }
 
-bool WebDatabase::RemoveFormElement(const std::wstring& name,
-                                    const std::wstring& value) {
+bool WebDatabase::RemoveFormElement(const string16& name,
+                                    const string16& value) {
   // Find the id for that pair.
   sql::Statement s(db_.GetUniqueStatement(
       "SELECT pair_id FROM autofill WHERE  name = ? AND value= ?"));
   if (!s) {
     NOTREACHED() << "Statement 1 prepare failed";
     return false;
   }
-  s.BindString(0, WideToUTF8(name));
-  s.BindString(1, WideToUTF8(value));
+  s.BindString(0, UTF16ToUTF8(name));
+  s.BindString(1, UTF16ToUTF8(value));
 
   if (s.Step())
     return RemoveFormElementForID(s.ColumnInt64(0));
   return false;
 }
 
 bool WebDatabase::AddToCountOfFormElement(int64 pair_id, int delta) {
   int count = 0;
 
   if (!GetCountOfFormElement(pair_id, &count))
@@ skipping 62 matching lines @@
 
     // Add successive versions here.  Each should set the version number and
     // compatible version number as appropriate, then fall through to the next
     // case.
 
     case kCurrentVersionNumber:
       // No migration needed.
       return;
   }
 }