Remove wstring from TemplateURL and friends....

chrome/browser/webdata/web_database.cc

 // Copyright (c) 2010 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 <set>
 #include <string>
@@ skipping 161 matching lines @@
 const int kUrlIdPosition = 16;
 
 // Keys used in the meta table.
 const char* kDefaultSearchProviderKey = "Default Search Provider ID";
 const char* kBuiltinKeywordVersion = "Builtin Keyword Version";
 
 // The maximum length allowed for form data.
 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());
   } else {
     s->BindString(2, history::HistoryDatabase::GURLToDatabaseURL(
                        url.GetFavIconURL()));
   }
   s->BindString(3, url.url() ? url.url()->url() : std::string());
   s->BindInt(4, url.safe_for_autoreplace() ? 1 : 0);
   if (!url.originating_url().is_valid()) {
@@ skipping 665 matching lines @@
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
   while (s.Step()) {
     TemplateURL* template_url = new TemplateURL();
     template_url->set_id(s.ColumnInt64(0));
 
     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())
       template_url->SetFavIconURL(GURL(tmp));
 
     template_url->SetURL(s.ColumnString(4), 0, 0);
 
     template_url->set_safe_for_autoreplace(s.ColumnInt(5) == 1);
 
     tmp = s.ColumnString(6);
@@ skipping 1314 matching lines @@
                          "verification_code_encrypted BLOB)")) {
           LOG(WARNING) << "Unable to update web database to version 27.";
           NOTREACHED();
           return sql::INIT_FAILURE;
         }
 
         if (!db_.Execute(
             "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;
         }
 
         if (!db_.Execute("DROP TABLE credit_cards")) {
           LOG(WARNING) << "Unable to update web database to version 27.";
           NOTREACHED();
           return sql::INIT_FAILURE;
         }
@@ skipping 284 matching lines @@
                          "fax VARCHAR, "
                          "date_modified INTEGER NOT NULL DEFAULT 0)")) {
           LOG(WARNING) << "Unable to update web database to version 32.";
           NOTREACHED();
           return sql::INIT_FAILURE;
         }
 
         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();
           return sql::INIT_FAILURE;
         }
 
         if (!db_.Execute("DROP TABLE autofill_profiles")) {
           LOG(WARNING) << "Unable to update web database to version 32.";
           NOTREACHED();
           return sql::INIT_FAILURE;
@@ skipping 53 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 sql::INIT_OK;
   }
 }