diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:18:05 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:18:05 +0000 |
| commit | 04338722eaee6d09b761353fb6e937b41933ff5e (patch) | |
| tree | f15c65f4c1345126fdb05a5855aeb98dbef57bbb /chrome/browser/history/android/android_cache_database_unittest.cc | |
| parent | cc2a2a22ebb171ff4c1eb528b3f8d7e551512732 (diff) | |
| download | chromium_src-04338722eaee6d09b761353fb6e937b41933ff5e.zip chromium_src-04338722eaee6d09b761353fb6e937b41933ff5e.tar.gz chromium_src-04338722eaee6d09b761353fb6e937b41933ff5e.tar.bz2 | |
Revert 242454 "Revert 242450 "Update some uses of UTF conversion..."
> Revert 242450 "Update some uses of UTF conversions in chrome/bro..."
>
> > Update some uses of UTF conversions in chrome/browser to use the base:: namespace.
> >
> > BUG=330556
> > TEST=no change
> > TBR=ben@chromium.org
> >
> > Review URL: https://codereview.chromium.org/120953002
>
> TBR=avi@chromium.org
>
> Review URL: https://codereview.chromium.org/107423005
TBR=avi@chromium.org
Review URL: https://codereview.chromium.org/121003002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/android/android_cache_database_unittest.cc')
| -rw-r--r-- | chrome/browser/history/android/android_cache_database_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/history/android/android_cache_database_unittest.cc b/chrome/browser/history/android/android_cache_database_unittest.cc index e56e3e9..5e14aa7 100644 --- a/chrome/browser/history/android/android_cache_database_unittest.cc +++ b/chrome/browser/history/android/android_cache_database_unittest.cc @@ -73,7 +73,7 @@ TEST_F(AndroidCacheDatabaseTest, InitAndroidCacheDatabase) { TEST_F(AndroidCacheDatabaseTest, SearchTermsTable) { // Test AddSearchTerm. Time search_time1 = Time::Now() - TimeDelta::FromDays(1); - base::string16 search_term1(UTF8ToUTF16("search term 1")); + base::string16 search_term1(base::UTF8ToUTF16("search term 1")); SearchTermID id1 = history_db_.AddSearchTerm(search_term1, search_time1); ASSERT_TRUE(id1); SearchTermRow row1; @@ -85,7 +85,7 @@ TEST_F(AndroidCacheDatabaseTest, SearchTermsTable) { // Test UpdateSearchTerm. SearchTermRow update_row1; - update_row1.term = (UTF8ToUTF16("update search term1")); + update_row1.term = (base::UTF8ToUTF16("update search term1")); update_row1.last_visit_time = Time::Now(); ASSERT_TRUE(history_db_.UpdateSearchTerm(id1, update_row1)); EXPECT_EQ(id1, history_db_.GetSearchTerm(update_row1.term, &row1)); @@ -95,7 +95,7 @@ TEST_F(AndroidCacheDatabaseTest, SearchTermsTable) { EXPECT_EQ(id1, row1.id); Time search_time2 = Time::Now() - TimeDelta::FromHours(1); - base::string16 search_term2(UTF8ToUTF16("search term 2")); + base::string16 search_term2(base::UTF8ToUTF16("search term 2")); SearchTermID id2 = history_db_.AddSearchTerm(search_term2, search_time2); ASSERT_TRUE(id2); ASSERT_TRUE(history_db_.SetKeywordSearchTermsForURL(1, 1, search_term2)); |