Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Unified Diff: chrome/browser/sessions/session_types_unittest.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sessions/session_types_unittest.cc
diff --git a/chrome/browser/sessions/session_types_unittest.cc b/chrome/browser/sessions/session_types_unittest.cc
index aabeaf1cad92c24c36f43204c91cc87bc5bb6874..a4b522ce55f30769912badfe430859d0ab4ade17 100644
--- a/chrome/browser/sessions/session_types_unittest.cc
+++ b/chrome/browser/sessions/session_types_unittest.cc
@@ -31,12 +31,12 @@ const content::Referrer kReferrer =
content::Referrer(GURL("http://www.referrer.com"),
blink::WebReferrerPolicyAlways);
const GURL kVirtualURL("http://www.virtual-url.com");
-const base::string16 kTitle = ASCIIToUTF16("title");
+const base::string16 kTitle = base::ASCIIToUTF16("title");
const content::PageState kPageState =
content::PageState::CreateFromEncodedData("page state");
const GURL kOriginalRequestURL("http://www.original-request.com");
const base::Time kTimestamp = syncer::ProtoTimeToTime(100);
-const base::string16 kSearchTerms = ASCIIToUTF16("my search terms");
+const base::string16 kSearchTerms = base::ASCIIToUTF16("my search terms");
const GURL kFaviconURL("http://virtual-url.com/favicon.ico");
// Create a typical SessionTab protocol buffer and set an existing
@@ -83,7 +83,7 @@ TEST(SessionTab, FromSyncData) {
for (int i = 0; i < 5; ++i) {
EXPECT_EQ(i, tab.navigations[i].index());
EXPECT_EQ(GURL("referrer"), tab.navigations[i].referrer().url);
- EXPECT_EQ(ASCIIToUTF16("title"),tab.navigations[i].title());
+ EXPECT_EQ(base::ASCIIToUTF16("title"),tab.navigations[i].title());
EXPECT_EQ(content::PAGE_TRANSITION_TYPED,
tab.navigations[i].transition_type());
EXPECT_EQ(GURL("http://foo/" + base::IntToString(i)),
@@ -120,7 +120,7 @@ TEST(SessionTab, ToSyncData) {
for (int i = 0; i < 5; ++i) {
EXPECT_EQ(tab.navigations[i].virtual_url().spec(),
sync_data.navigation(i).virtual_url());
- EXPECT_EQ(UTF16ToUTF8(tab.navigations[i].title()),
+ EXPECT_EQ(base::UTF16ToUTF8(tab.navigations[i].title()),
sync_data.navigation(i).title());
}
EXPECT_FALSE(sync_data.has_favicon());

Powered by Google App Engine
This is Rietveld 408576698