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

chrome/browser/webdata/web_database_unittest.cc

Index: chrome/browser/webdata/web_database_unittest.cc
===================================================================
--- chrome/browser/webdata/web_database_unittest.cc	(revision 29209)
+++ chrome/browser/webdata/web_database_unittest.cc	(working copy)
@@ -392,19 +392,22 @@
   // Simulate the submission of a handful of entries in a field called "Name",
   // some more often than others.
   EXPECT_TRUE(db.AddAutofillFormElement(
-      AutofillForm::Element(L"Name", L"Superman")));
-  std::vector<std::wstring> v;
+      AutofillForm::Element(ASCIIToUTF16("Name"), ASCIIToUTF16("Superman"))));
+  std::vector<string16> v;
   for (int i = 0; i < 5; i++) {
     EXPECT_TRUE(db.AddAutofillFormElement(
-        AutofillForm::Element(L"Name", L"Clark Kent")));
+        AutofillForm::Element(ASCIIToUTF16("Name"),
+                              ASCIIToUTF16("Clark Kent"))));
   }
   for (int i = 0; i < 3; i++) {
     EXPECT_TRUE(db.AddAutofillFormElement(
-        AutofillForm::Element(L"Name", L"Clark Sutter")));
+        AutofillForm::Element(ASCIIToUTF16("Name"),
+                              ASCIIToUTF16("Clark Sutter"))));
   }
   for (int i = 0; i < 2; i++) {
     EXPECT_TRUE(db.AddAutofillFormElement(
-        AutofillForm::Element(L"Favorite Color", L"Green")));
+        AutofillForm::Element(ASCIIToUTF16("Favorite Color"),
+                              ASCIIToUTF16("Green"))));
   }
 
   int count = 0;
@@ -413,47 +416,54 @@
   // We have added the name Clark Kent 5 times, so count should be 5 and pair_id
   // should be somthing non-zero.
   EXPECT_TRUE(db.GetIDAndCountOfFormElement(
-      AutofillForm::Element(L"Name", L"Clark Kent"), &pair_id, &count));
+      AutofillForm::Element(ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent")),
+      &pair_id, &count));
   EXPECT_EQ(5, count);
   EXPECT_NE(0, pair_id);
 
   // Storing in the data base should be case sensitive, so there should be no
   // database entry for clark kent lowercase.
   EXPECT_TRUE(db.GetIDAndCountOfFormElement(
-      AutofillForm::Element(L"Name", L"clark kent"), &pair_id, &count));
+      AutofillForm::Element(ASCIIToUTF16("Name"), ASCIIToUTF16("clark kent")),
+      &pair_id, &count));
   EXPECT_EQ(0, count);
 
   EXPECT_TRUE(db.GetIDAndCountOfFormElement(
-      AutofillForm::Element(L"Favorite Color", L"Green"), &pair_id, &count));
+      AutofillForm::Element(ASCIIToUTF16("Favorite Color"),
+                            ASCIIToUTF16("Green")),
+      &pair_id, &count));
   EXPECT_EQ(2, count);
 
   // This is meant to get a list of suggestions for Name.  The empty prefix
   // in the second argument means it should return all suggestions for a name
   // no matter what they start with.  The order that the names occur in the list
   // should be decreasing order by count.
-  EXPECT_TRUE(db.GetFormValuesForElementName(L"Name", std::wstring(), &v, 6));
+  EXPECT_TRUE(db.GetFormValuesForElementName(
+      ASCIIToUTF16("Name"), string16(), &v, 6));
   EXPECT_EQ(3U, v.size());
   if (v.size() == 3) {
-    EXPECT_EQ(L"Clark Kent", v[0]);
-    EXPECT_EQ(L"Clark Sutter", v[1]);
-    EXPECT_EQ(L"Superman", v[2]);
+    EXPECT_EQ(ASCIIToUTF16("Clark Kent"), v[0]);
+    EXPECT_EQ(ASCIIToUTF16("Clark Sutter"), v[1]);
+    EXPECT_EQ(ASCIIToUTF16("Superman"), v[2]);
   }
 
   // If we query again limiting the list size to 1, we should only get the most
   // frequent entry.
-  EXPECT_TRUE(db.GetFormValuesForElementName(L"Name", L"", &v, 1));
+  EXPECT_TRUE(db.GetFormValuesForElementName(
+      ASCIIToUTF16("Name"), string16(), &v, 1));
   EXPECT_EQ(1U, v.size());
   if (v.size() == 1) {
-    EXPECT_EQ(L"Clark Kent", v[0]);
+    EXPECT_EQ(ASCIIToUTF16("Clark Kent"), v[0]);
   }
 
   // Querying for suggestions given a prefix is case-insensitive, so the prefix
   // "cLa" shoud get suggestions for both Clarks.
-  EXPECT_TRUE(db.GetFormValuesForElementName(L"Name", L"cLa", &v, 6));
+  EXPECT_TRUE(db.GetFormValuesForElementName(
+      ASCIIToUTF16("Name"), ASCIIToUTF16("cLa"), &v, 6));
   EXPECT_EQ(2U, v.size());
   if (v.size() == 2) {
-    EXPECT_EQ(L"Clark Kent", v[0]);
-    EXPECT_EQ(L"Clark Sutter", v[1]);
+    EXPECT_EQ(ASCIIToUTF16("Clark Kent"), v[0]);
+    EXPECT_EQ(ASCIIToUTF16("Clark Sutter"), v[1]);
   }
 
   // Removing all elements since the beginning of this function should remove
@@ -461,33 +471,37 @@
   EXPECT_TRUE(db.RemoveFormElementsAddedBetween(t1, Time()));
 
   EXPECT_TRUE(db.GetIDAndCountOfFormElement(
-      AutofillForm::Element(L"Name", L"Clark Kent"), &pair_id, &count));
+      AutofillForm::Element(ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent")),
+      &pair_id, &count));
   EXPECT_EQ(0, count);
 
-  EXPECT_TRUE(db.GetFormValuesForElementName(L"Name", L"", &v, 6));
+  EXPECT_TRUE(
+      db.GetFormValuesForElementName(ASCIIToUTF16("Name"), string16(), &v, 6));
   EXPECT_EQ(0U, v.size());
 
   // Now add some values with empty strings.
-  const std::wstring kValue = L"  toto   ";
-  EXPECT_TRUE(db.AddAutofillFormElement(AutofillForm::Element(L"blank", L"")));
-  EXPECT_TRUE(db.AddAutofillFormElement(AutofillForm::Element(L"blank",
-                                                              L" ")));
-  EXPECT_TRUE(db.AddAutofillFormElement(AutofillForm::Element(L"blank",
-                                                              L"      ")));
-  EXPECT_TRUE(db.AddAutofillFormElement(AutofillForm::Element(L"blank",
-                                                              kValue)));
+  const string16 kValue = ASCIIToUTF16("  toto   ");
+  EXPECT_TRUE(db.AddAutofillFormElement(
+      AutofillForm::Element(ASCIIToUTF16("blank"), string16())));
+  EXPECT_TRUE(db.AddAutofillFormElement(
+      AutofillForm::Element(ASCIIToUTF16("blank"), ASCIIToUTF16(" "))));
+  EXPECT_TRUE(db.AddAutofillFormElement(
+      AutofillForm::Element(ASCIIToUTF16("blank"), ASCIIToUTF16("      "))));
+  EXPECT_TRUE(db.AddAutofillFormElement(
+      AutofillForm::Element(ASCIIToUTF16("blank"), kValue)));
 
   // They should be stored normally as the DB layer does not check for empty
   // values.
   v.clear();
-  EXPECT_TRUE(db.GetFormValuesForElementName(L"blank", L"", &v, 10));
+  EXPECT_TRUE(db.GetFormValuesForElementName(
+      ASCIIToUTF16("blank"), string16(), &v, 10));
   EXPECT_EQ(4U, v.size());
 
   // Now we'll check that ClearAutofillEmptyValueElements() works as expected.
   db.ClearAutofillEmptyValueElements();
 
   v.clear();
-  EXPECT_TRUE(db.GetFormValuesForElementName(L"blank", L"", &v, 10));
+  EXPECT_TRUE(db.GetFormValuesForElementName(ASCIIToUTF16("blank"), string16(), &v, 10));
   ASSERT_EQ(1U, v.size());
 
   EXPECT_EQ(kValue, v[0]);