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

Unified Diff: content/renderer/android/email_detector_unittest.cc

Issue 121033002: Update uses of UTF conversions in content/ 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
« no previous file with comments | « content/renderer/android/email_detector.cc ('k') | content/renderer/android/phone_number_detector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/android/email_detector_unittest.cc
diff --git a/content/renderer/android/email_detector_unittest.cc b/content/renderer/android/email_detector_unittest.cc
index 45bcc9bf48387c55a98d203e1da2da940db6d76e..c695617c7117a9eee4aa9219f788732ee80b8782 100644
--- a/content/renderer/android/email_detector_unittest.cc
+++ b/content/renderer/android/email_detector_unittest.cc
@@ -13,7 +13,7 @@ class EmailDetectorTest : public testing::Test {
public:
static void FindAndCheckEmail(const std::string& content,
const std::string& expected) {
- base::string16 content_16 = UTF8ToUTF16(content);
+ base::string16 content_16 = base::UTF8ToUTF16(content);
base::string16 result_16;
size_t start, end;
EmailDetector detector;
@@ -22,7 +22,7 @@ class EmailDetectorTest : public testing::Test {
&start, &end, &content_text)) {
result_16 = content_16.substr(start, end - start);
}
- EXPECT_EQ(expected, UTF16ToUTF8(result_16));
+ EXPECT_EQ(expected, base::UTF16ToUTF8(result_16));
EXPECT_EQ(expected, content_text);
}
};
« no previous file with comments | « content/renderer/android/email_detector.cc ('k') | content/renderer/android/phone_number_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698