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

chrome/browser/history/starred_url_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/history/starred_url_database.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/json_writer.h"
 #include "base/string_util.h"
@@ skipping 40 matching lines @@
     "starred.visual_order, starred.parent_id, urls.url, urls.id, " \
     "starred.group_id, starred.date_modified "
 const char kHistoryStarFields[] = STAR_FIELDS;
 
 void FillInStarredEntry(SQLStatement* s, StarredEntry* entry) {
   DCHECK(entry);
   entry->id = s->column_int64(0);
   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;
       break;
     case 2:
       entry->type = history::StarredEntry::USER_GROUP;
       break;
     case 3:
       entry->type = history::StarredEntry::OTHER;
       break;
     default:
       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);
   entry->url_id = s->column_int64(7);
   entry->group_id = s->column_int64(8);
   entry->date_group_modified = Time::FromInternalValue(s->column_int64(9));
 }
 
 }  // namespace
 
@@ skipping 535 matching lines @@
   scoped_ptr<Value> encoded_bookmarks(
       encoder.Encode(&bookmark_bar_node, &other_node));
   std::string content;
   JSONWriter::Write(encoded_bookmarks.get(), true, &content);
 
   return (file_util::WriteFile(path, content.c_str(),
                                static_cast<int>(content.length())) != -1);
 }
 
 }  // namespace history