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

for example Linux.

The problem was that old code assumed wstring is UTF-16, which resulted
in string corruption on Linux. I actually tested it on browser/history
unit tests, see http://codereview.chromium.org/18758.

Review URL: http://codereview.chromium.org/18805

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8977 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc
index c4fabbc0..2a877c4 100644
--- a/chrome/browser/history/starred_url_database.cc
+++ b/chrome/browser/history/starred_url_database.cc
@@ -58,7 +58,7 @@ void FillInStarredEntry(SQLStatement* s, StarredEntry* entry) {
   switch (s->column_int(1)) {
     case 0:
       entry->type = history::StarredEntry::URL;
-      entry->url = GURL(WideToUTF8(s->column_string16(6)));
+      entry->url = GURL(WideToUTF8(s->column_wstring(6)));
       break;
     case 1:
       entry->type = history::StarredEntry::BOOKMARK_BAR;
@@ -73,7 +73,7 @@ void FillInStarredEntry(SQLStatement* s, StarredEntry* entry) {
       NOTREACHED();
       break;
   }
-  entry->title = s->column_string16(2);
+  entry->title = s->column_wstring(2);
   entry->date_added = Time::FromInternalValue(s->column_int64(3));
   entry->visual_order = s->column_int(4);
   entry->parent_group_id = s->column_int64(5);