diff options
Diffstat (limited to 'content/browser/media')
5 files changed, 9 insertions, 9 deletions
diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc index f4e5eaf..9c0dbac 100644 --- a/content/browser/media/encrypted_media_browsertest.cc +++ b/content/browser/media/encrypted_media_browsertest.cc @@ -116,8 +116,8 @@ class EncryptedMediaTest : public content::MediaBrowserTest, // We want to fail quickly when a test fails because an error is encountered. virtual void AddWaitForTitles(content::TitleWatcher* title_watcher) OVERRIDE { MediaBrowserTest::AddWaitForTitles(title_watcher); - title_watcher->AlsoWaitForTitle(ASCIIToUTF16(kEmeNotSupportedError)); - title_watcher->AlsoWaitForTitle(ASCIIToUTF16(kEmeKeyError)); + title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError)); + title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError)); } #if defined(OS_ANDROID) diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc index 34546b0..c14c362 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 diff --git a/content/browser/media/webrtc_aecdump_browsertest.cc b/content/browser/media/webrtc_aecdump_browsertest.cc index 5ba5a85..bda90c9 100644 --- a/content/browser/media/webrtc_aecdump_browsertest.cc +++ b/content/browser/media/webrtc_aecdump_browsertest.cc @@ -53,7 +53,7 @@ class WebrtcAecDumpBrowserTest : public ContentBrowserTest { } void ExpectTitle(const std::string& expected_title) const { - base::string16 expected_title16(ASCIIToUTF16(expected_title)); + base::string16 expected_title16(base::ASCIIToUTF16(expected_title)); TitleWatcher title_watcher(shell()->web_contents(), expected_title16); EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); } diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc index 5e3666c..af7b087 100644 --- a/content/browser/media/webrtc_browsertest.cc +++ b/content/browser/media/webrtc_browsertest.cc @@ -224,7 +224,7 @@ class WebrtcBrowserTest: public ContentBrowserTest { } void ExpectTitle(const std::string& expected_title) const { - base::string16 expected_title16(ASCIIToUTF16(expected_title)); + base::string16 expected_title16(base::ASCIIToUTF16(expected_title)); TitleWatcher title_watcher(shell()->web_contents(), expected_title16); EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); } diff --git a/content/browser/media/webrtc_internals_browsertest.cc b/content/browser/media/webrtc_internals_browsertest.cc index 0d279b3..9750073 100644 --- a/content/browser/media/webrtc_internals_browsertest.cc +++ b/content/browser/media/webrtc_internals_browsertest.cc @@ -145,7 +145,7 @@ class MAYBE_WebRTCInternalsBrowserTest: public ContentBrowserTest { } void ExpectTitle(const std::string& expected_title) const { - base::string16 expected_title16(ASCIIToUTF16(expected_title)); + base::string16 expected_title16(base::ASCIIToUTF16(expected_title)); TitleWatcher title_watcher(shell()->web_contents(), expected_title16); EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); } |