Correct sqlite wrapper behavior on systems where wchar_t is UTF-32,

chrome/browser/webdata/web_database.cc

 // Copyright (c) 2006-2008 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 523 matching lines @@
                 "FROM keywords ORDER BY id ASC") != SQLITE_OK) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
   int result;
   while ((result = s.step()) == SQLITE_ROW) {
     TemplateURL* template_url = new TemplateURL();
     std::wstring tmp;
     template_url->set_id(s.column_int64(0));
 
-    s.column_string16(1, &tmp);
+    s.column_wstring(1, &tmp);
     DCHECK(!tmp.empty());
     template_url->set_short_name(tmp);
 
-    s.column_string16(2, &tmp);
+    s.column_wstring(2, &tmp);
     template_url->set_keyword(tmp);
 
-    s.column_string16(3, &tmp);
+    s.column_wstring(3, &tmp);
     if (!tmp.empty())
       template_url->SetFavIconURL(GURL(WideToUTF8(tmp)));
 
-    s.column_string16(4, &tmp);
+    s.column_wstring(4, &tmp);
     template_url->SetURL(tmp, 0, 0);
 
     template_url->set_safe_for_autoreplace(s.column_int(5) == 1);
 
-    s.column_string16(6, &tmp);
+    s.column_wstring(6, &tmp);
     if (!tmp.empty())
       template_url->set_originating_url(GURL(WideToUTF8(tmp)));
 
     template_url->set_date_created(Time::FromTimeT(s.column_int64(7)));
 
     template_url->set_usage_count(s.column_int(8));
 
     std::vector<std::string> encodings;
     SplitString(s.column_string(9), ';', &encodings);
     template_url->set_input_encodings(encodings);
 
     template_url->set_show_in_default_list(s.column_int(10) == 1);
 
-    s.column_string16(11, &tmp);
+    s.column_wstring(11, &tmp);
     template_url->SetSuggestionsURL(tmp, 0, 0);
 
     template_url->set_prepopulate_id(s.column_int(12));
 
     template_url->set_autogenerate_keyword(s.column_int(13) == 1);
 
     urls->push_back(template_url);
   }
   return result == SQLITE_DONE;
 }
@@ skipping 169 matching lines @@
 }
 
 static void InitPasswordFormFromStatement(PasswordForm* form,
                                           SQLStatement* s) {
   std::string encrypted_password;
   std::string tmp;
   s->column_string(0, &tmp);
   form->origin = GURL(tmp);
   s->column_string(1, &tmp);
   form->action = GURL(tmp);
-  s->column_string16(2, &form->username_element);
-  s->column_string16(3, &form->username_value);
-  s->column_string16(4, &form->password_element);
+  s->column_wstring(2, &form->username_element);
+  s->column_wstring(3, &form->username_value);
+  s->column_wstring(4, &form->password_element);
   s->column_blob_as_string(5, &encrypted_password);
   Encryptor::DecryptWideString(encrypted_password, &form->password_value);
-  s->column_string16(6, &form->submit_element);
+  s->column_wstring(6, &form->submit_element);
   s->column_string(7, &tmp);
   form->signon_realm = tmp;
   form->ssl_valid = (s->column_int(8) > 0);
   form->preferred = (s->column_int(9) > 0);
   form->date_created = Time::FromTimeT(s->column_int64(10));
   form->blacklisted_by_user = (s->column_int(11) > 0);
   int scheme_int = s->column_int(12);
   DCHECK((scheme_int >= 0) && (scheme_int <= PasswordForm::SCHEME_OTHER));
   form->scheme = static_cast<PasswordForm::Scheme>(scheme_int);
 }
@@ skipping 233 matching lines @@
 
     s.bind_wstring(0, name);
     s.bind_wstring(1, prefix_lower);
     s.bind_wstring(2, next_prefix);
     s.bind_int(3, limit);
   }
 
   values->clear();
   int result;
   while ((result = s.step()) == SQLITE_ROW)
-    values->push_back(s.column_string16(0));
+    values->push_back(s.column_wstring(0));
 
   return result == SQLITE_DONE;
 }
 
 bool WebDatabase::RemoveFormElementsAddedBetween(const Time delete_begin,
                                                  const Time delete_end) {
   SQLStatement s;
   if (s.prepare(db_,
                 "SELECT DISTINCT pair_id FROM autofill_dates WHERE "
                 "date_created >= ? AND date_created < ?") != SQLITE_OK) {
@@ skipping 109 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;
   }
 }