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

chrome/browser/importer/firefox3_importer.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/importer/firefox3_importer.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/scoped_ptr.h"
@@ skipping 85 matching lines @@
 
   std::vector<history::URLRow> rows;
   while (s.step() == SQLITE_ROW && !cancelled()) {
     GURL url(s.column_string(0));
 
     // Filter out unwanted URLs.
     if (!CanImportURL(url))
       continue;
 
     history::URLRow row(url);
-    row.set_title(s.column_string16(1));
+    row.set_title(s.column_wstring(1));
     row.set_visit_count(s.column_int(2));
     row.set_hidden(s.column_int(3) == 1);
     row.set_typed_count(s.column_int(4));
     row.set_last_visit(Time::FromTimeT(s.column_int64(5)/1000000));
 
     rows.push_back(row);
   }
   if (!rows.empty() && !cancelled()) {
     main_loop_->PostTask(FROM_HERE, NewRunnableMethod(writer_,
         &ProfileWriter::AddHistoryPage, rows));
@@ skipping 297 matching lines @@
          "WHERE b.type = 2 AND b.id = ? "
          "ORDER BY b.position";
   if (s.prepare(db, stmt) != SQLITE_OK)
     return;
 
   s.bind_int(0, folder_id);
   if (s.step() == SQLITE_ROW) {
     BookmarkItem* item = new BookmarkItem;
     item->parent = -1;  // The top level folder has no parent.
     item->id = folder_id;
-    item->title = s.column_string16(0);
+    item->title = s.column_wstring(0);
     item->type = 2;
     item->favicon = 0;
     list->push_back(item);
   }
 }
 
 void Firefox3Importer::GetWholeBookmarkFolder(sqlite3* db, BookmarkList* list,
                                               size_t position) {
   if (position >= list->size()) {
     NOTREACHED();
@@ skipping 11 matching lines @@
   if (s.prepare(db, stmt) != SQLITE_OK)
     return;
 
   s.bind_int(0, (*list)[position]->id);
   BookmarkList temp_list;
   while (s.step() == SQLITE_ROW) {
     BookmarkItem* item = new BookmarkItem;
     item->parent = static_cast<int>(position);
     item->id = s.column_int(0);
     item->url = GURL(s.column_string(1));
-    item->title = s.column_string16(2);
+    item->title = s.column_wstring(2);
     item->type = s.column_int(3);
     item->keyword = s.column_string(4);
     item->date_added = Time::FromTimeT(s.column_int64(5)/1000000);
     item->favicon = s.column_int64(6);
 
     temp_list.push_back(item);
   }
 
   // Appends all items to the list.
   for (BookmarkList::iterator i = temp_list.begin();
@@ skipping 30 matching lines @@
 
       if (!ReencodeFavicon(&data[0], data.size(), &usage.png_data))
         continue;  // Unable to decode.
 
       usage.urls = i->second;
       favicons->push_back(usage);
     }
     s.reset();
   }
 }