| Index: chrome/browser/history/starred_url_database.cc
|
| diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc
|
| index c4fabbc09eff967babf379aa905dd30474f56c94..2a877c41dbdf6bbea70a6da9a68a8e0e9e3661fd 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);
|
|
|