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

Unified Diff: content/browser/media/media_browsertest.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
Index: content/browser/media/media_browsertest.cc
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
index 34546b03223c2dfba8db4a482231af377271f916..c14c3623c1397592ed28f9eb0f4dd4df1a84e1f4 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -59,7 +59,7 @@ void MediaBrowserTest::RunMediaTestPage(
}
void MediaBrowserTest::RunTest(const GURL& gurl, const char* expected) {
- const base::string16 expected_title = ASCIIToUTF16(expected);
+ const base::string16 expected_title = base::ASCIIToUTF16(expected);
DVLOG(1) << "Running test URL: " << gurl;
TitleWatcher title_watcher(shell()->web_contents(), expected_title);
AddWaitForTitles(&title_watcher);
@@ -70,9 +70,9 @@ void MediaBrowserTest::RunTest(const GURL& gurl, const char* expected) {
}
void MediaBrowserTest::AddWaitForTitles(content::TitleWatcher* title_watcher) {
- title_watcher->AlsoWaitForTitle(ASCIIToUTF16(kEnded));
- title_watcher->AlsoWaitForTitle(ASCIIToUTF16(kError));
- title_watcher->AlsoWaitForTitle(ASCIIToUTF16(kFailed));
+ title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEnded));
+ title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kError));
+ title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kFailed));
}
// Tests playback and seeking of an audio or video file over file or http based
« no previous file with comments | « content/browser/media/encrypted_media_browsertest.cc ('k') | content/browser/media/webrtc_aecdump_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698