diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 15:35:25 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 15:35:25 +0000 |
| commit | e5366896e9ccb3dd17c590d115bd999e987a33af (patch) | |
| tree | 52f4fc2f07b73aaca1199adb1384b123130c22ed /chrome/browser/history/history_backend_unittest.cc | |
| parent | b133cc2db84fc83d5c4aa53020237788fa344c75 (diff) | |
| download | chromium_src-e5366896e9ccb3dd17c590d115bd999e987a33af.zip chromium_src-e5366896e9ccb3dd17c590d115bd999e987a33af.tar.gz chromium_src-e5366896e9ccb3dd17c590d115bd999e987a33af.tar.bz2 | |
Replace wstring with string16 in history. The only time wstring is used now in history is for bookmark-related stuff (the bookmarks system is still wstring-based).
The substantial change here is in RTL to make a string16 variant of the functions and in changing the WordIterator to use string16 (this cleaned up some weird utf-32 code).
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2808017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/history_backend_unittest.cc')
| -rw-r--r-- | chrome/browser/history/history_backend_unittest.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc index 1628d76..4d1dca6 100644 --- a/chrome/browser/history/history_backend_unittest.cc +++ b/chrome/browser/history/history_backend_unittest.cc @@ -250,10 +250,12 @@ TEST_F(HistoryBackendTest, DeleteAll) { // Set full text index for each one. backend_->text_database_->AddPageData(row1.url(), row1_id, visit1_id, row1.last_visit(), - L"Title 1", UTF8ToUTF16("Body 1")); + UTF8ToUTF16("Title 1"), + UTF8ToUTF16("Body 1")); backend_->text_database_->AddPageData(row2.url(), row2_id, visit2_id, row2.last_visit(), - L"Title 2", UTF8ToUTF16("Body 2")); + UTF8ToUTF16("Title 2"), + UTF8ToUTF16("Body 2")); // Now finally clear all history. backend_->DeleteAllHistory(); @@ -298,7 +300,8 @@ TEST_F(HistoryBackendTest, DeleteAll) { // The full text database should have no data. std::vector<TextDatabase::Match> text_matches; Time first_time_searched; - backend_->text_database_->GetTextMatches(L"Body", QueryOptions(), + backend_->text_database_->GetTextMatches(UTF8ToUTF16("Body"), + QueryOptions(), &text_matches, &first_time_searched); EXPECT_EQ(0U, text_matches.size()); |