Remove wstring from TemplateURL and friends....

chrome/browser/webdata/web_database.cc

Index: chrome/browser/webdata/web_database.cc
===================================================================
--- chrome/browser/webdata/web_database.cc	(revision 71269)
+++ chrome/browser/webdata/web_database.cc	(working copy)
@@ -179,8 +179,8 @@
 const size_t kMaxDataLength = 1024;
 
 void BindURLToStatement(const TemplateURL& url, sql::Statement* s) {
-  s->BindString(0, WideToUTF8(url.short_name()));
-  s->BindString(1, WideToUTF8(url.keyword()));
+  s->BindString(0, UTF16ToUTF8(url.short_name()));
+  s->BindString(1, UTF16ToUTF8(url.keyword()));
   GURL favicon_url = url.GetFavIconURL();
   if (!favicon_url.is_valid()) {
     s->BindString(2, std::string());
@@ -866,9 +866,9 @@
     std::string tmp;
     tmp = s.ColumnString(1);
     DCHECK(!tmp.empty());
-    template_url->set_short_name(UTF8ToWide(tmp));
+    template_url->set_short_name(UTF8ToUTF16(tmp));
 
-    template_url->set_keyword(UTF8ToWide(s.ColumnString(2)));
+    template_url->set_keyword(UTF8ToUTF16(s.ColumnString(2)));
 
     tmp = s.ColumnString(3);
     if (!tmp.empty())
@@ -2203,8 +2203,8 @@
             "INSERT INTO credit_cards_temp "
             "SELECT label,unique_id,name_on_card,type,card_number,"
             "expiration_month,expiration_year,verification_code,0,"
-            "shipping_address,card_number_encrypted,verification_code_encrypted "
-            "FROM credit_cards")) {
+            "shipping_address,card_number_encrypted,"
+            "verification_code_encrypted FROM credit_cards")) {
           LOG(WARNING) << "Unable to update web database to version 27.";
           NOTREACHED();
           return sql::INIT_FAILURE;
@@ -2509,8 +2509,8 @@
         if (!db_.Execute(
             "INSERT INTO autofill_profiles_temp "
             "SELECT guid, label, first_name, middle_name, last_name, email, "
-            "company_name, address_line_1, address_line_2, city, state, zipcode, "
-            "country, phone, fax, date_modified "
+            "company_name, address_line_1, address_line_2, city, state, "
+            "zipcode, country, phone, fax, date_modified "
             "FROM autofill_profiles")) {
           LOG(WARNING) << "Unable to update web database to version 32.";
           NOTREACHED();