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

Unified Diff: content/renderer/android/phone_number_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/phone_number_detector.cc ('k') | content/renderer/clipboard_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/android/phone_number_detector_unittest.cc
diff --git a/content/renderer/android/phone_number_detector_unittest.cc b/content/renderer/android/phone_number_detector_unittest.cc
index e248f0e451f46a9f16a5ce4710d0b4a9c24a54e2..5078cb559bbe76634f8a35fcb5d1a60f9f519a2f 100644
--- a/content/renderer/android/phone_number_detector_unittest.cc
+++ b/content/renderer/android/phone_number_detector_unittest.cc
@@ -13,7 +13,7 @@ class PhoneNumberDetectorTest : public testing::Test {
public:
static std::string FindNumber(const std::string& content,
const std::string& region) {
- base::string16 content_16 = UTF8ToUTF16(content);
+ base::string16 content_16 = base::UTF8ToUTF16(content);
base::string16 result_16;
size_t start, end;
PhoneNumberDetector detector(region);
@@ -21,12 +21,12 @@ class PhoneNumberDetectorTest : public testing::Test {
if (detector.FindContent(content_16.begin(), content_16.end(),
&start, &end, &content_text))
result_16 = content_16.substr(start, end - start);
- return UTF16ToUTF8(result_16);
+ return base::UTF16ToUTF8(result_16);
}
static std::string FindAndFormatNumber(const std::string& content,
const std::string& region) {
- base::string16 content_16 = UTF8ToUTF16(content);
+ base::string16 content_16 = base::UTF8ToUTF16(content);
base::string16 result_16;
size_t start, end;
PhoneNumberDetector detector(region);
« no previous file with comments | « content/renderer/android/phone_number_detector.cc ('k') | content/renderer/clipboard_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698