[media] Move test result message constants to test_data_util
Centralizing these constants is preparatory work for changing
their values (see bug).
Bug: 592067
Change-Id: Ifa9f4c5a943fc0b46c45bde18a4fef16faf2b175
Reviewed-on: https://chromium-review.googlesource.com/753201
Reviewed-by: Dan Sanders <[email protected]>
Commit-Queue: srirama chandra sekhar <[email protected]>
Cr-Commit-Position: refs/heads/master@{#516166}diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index 18af260..42b4464b 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -199,7 +199,7 @@
const std::string& media_type,
const std::string& key_system,
SrcType src_type) {
- std::string expected_title = kEnded;
+ std::string expected_title = media::kEnded;
if (!IsPlayBackPossible(key_system)) {
expected_title = kEmeUpdateFailed;
}
@@ -425,7 +425,8 @@
DCHECK(IsPlayBackPossible(CurrentKeySystem()));
RunEncryptedMediaTest(kDefaultEmePlayer, encrypted_media, media_type,
CurrentKeySystem(), CurrentSourceType(),
- kNoSessionToLoad, false, PlayCount::TWICE, kEnded);
+ kNoSessionToLoad, false, PlayCount::TWICE,
+ media::kEnded);
}
void RunInvalidResponseTest() {
@@ -439,7 +440,7 @@
RunEncryptedMediaTest(
"encrypted_frame_size_change.html", "frame_size_change-av_enc-v.webm",
kWebMVorbisAudioVP8Video, CurrentKeySystem(), CurrentSourceType(),
- kNoSessionToLoad, false, PlayCount::ONCE, kEnded);
+ kNoSessionToLoad, false, PlayCount::ONCE, media::kEnded);
}
void TestConfigChange(ConfigChangeType config_change_type) {
@@ -461,7 +462,7 @@
"configChangeType",
base::IntToString(static_cast<int>(config_change_type)));
RunEncryptedMediaTestPage("mse_config_change.html", CurrentKeySystem(),
- query_params, kEnded);
+ query_params, media::kEnded);
}
void TestPolicyCheck() {
@@ -502,7 +503,7 @@
query_params.push_back(
std::make_pair("audioFormat", ConvertContainerFormat(audio_format)));
RunEncryptedMediaTestPage("mse_different_containers.html",
- CurrentKeySystem(), query_params, kEnded);
+ CurrentKeySystem(), query_params, media::kEnded);
}
void DisableEncryptedMedia() {
@@ -650,8 +651,9 @@
DisableEncryptedMedia();
// Clear Key key system is always supported.
- std::string expected_title =
- media::IsClearKey(CurrentKeySystem()) ? kEnded : kEmeNotSupportedError;
+ std::string expected_title = media::IsClearKey(CurrentKeySystem())
+ ? media::kEnded
+ : kEmeNotSupportedError;
RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm",
kWebMVorbisAudioOnly, CurrentKeySystem(),
@@ -789,7 +791,8 @@
}
IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, Renewal) {
- TestPlaybackCase(kExternalClearKeyRenewalKeySystem, kNoSessionToLoad, kEnded);
+ TestPlaybackCase(kExternalClearKeyRenewalKeySystem, kNoSessionToLoad,
+ media::kEnded);
// Check renewal message received.
bool receivedRenewalMessage = false;
@@ -802,7 +805,7 @@
}
IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, LoadLoadableSession) {
- TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, kEnded);
+ TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, media::kEnded);
}
IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, LoadUnknownSession) {
@@ -846,7 +849,8 @@
}
base::StringPairs empty_query_params;
- RunMediaTestPage("multiple_cdm_types.html", empty_query_params, kEnded, true);
+ RunMediaTestPage("multiple_cdm_types.html", empty_query_params, media::kEnded,
+ true);
}
#endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
diff --git a/chrome/browser/media/media_browsertest.cc b/chrome/browser/media/media_browsertest.cc
index e35484c..1d5c4e48 100644
--- a/chrome/browser/media/media_browsertest.cc
+++ b/chrome/browser/media/media_browsertest.cc
@@ -19,18 +19,6 @@
namespace chrome {
-// TODO(sandersd): Change the tests to use a more unique message.
-// See http://crbug.com/592067
-
-// Normal failure title.
-const char MediaBrowserTest::kFailed[] = "FAILED";
-
-// Upper case event name set by Utils.installTitleEventHandler().
-const char MediaBrowserTest::kEnded[] = "ENDED";
-
-// Lower case event name as set by Utils.failTest().
-const char MediaBrowserTest::kError[] = "error";
-
MediaBrowserTest::MediaBrowserTest() : ignore_plugin_crash_(false) {}
MediaBrowserTest::~MediaBrowserTest() {}
@@ -73,9 +61,9 @@
}
void MediaBrowserTest::AddWaitForTitles(content::TitleWatcher* title_watcher) {
- title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEnded));
- title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kError));
- title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kFailed));
+ title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(media::kEnded));
+ title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(media::kError));
+ title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(media::kFailed));
}
void MediaBrowserTest::PluginCrashed(const base::FilePath& plugin_path,
diff --git a/chrome/browser/media/media_browsertest.h b/chrome/browser/media/media_browsertest.h
index fda6b72..44fc9aa 100644
--- a/chrome/browser/media/media_browsertest.h
+++ b/chrome/browser/media/media_browsertest.h
@@ -23,12 +23,6 @@
class MediaBrowserTest : public InProcessBrowserTest,
public content::WebContentsObserver {
protected:
- // Common test results.
- static const char kEnded[];
- // TODO(xhwang): Report detailed errors, e.g. "ERROR-3".
- static const char kError[];
- static const char kFailed[];
-
MediaBrowserTest();
~MediaBrowserTest() override;
diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc
index 434cee39..a680cab 100644
--- a/content/browser/media/encrypted_media_browsertest.cc
+++ b/content/browser/media/encrypted_media_browsertest.cc
@@ -13,6 +13,7 @@
#include "content/shell/browser/shell.h"
#include "media/base/media.h"
#include "media/base/media_switches.h"
+#include "media/base/test_data_util.h"
#include "media/media_features.h"
#include "media/mojo/features.h"
@@ -95,7 +96,7 @@
RunEncryptedMediaTest("encrypted_frame_size_change.html",
"frame_size_change-av_enc-v.webm",
kWebMVorbisAudioVP8Video, CurrentKeySystem(),
- CurrentSourceType(), kEnded);
+ CurrentSourceType(), media::kEnded);
}
void TestConfigChange(ConfigChangeType config_change_type) {
@@ -112,7 +113,8 @@
query_params.emplace_back(
"configChangeType",
base::IntToString(static_cast<int>(config_change_type)));
- RunMediaTestPage("mse_config_change.html", query_params, kEnded, true);
+ RunMediaTestPage("mse_config_change.html", query_params, media::kEnded,
+ true);
}
void RunEncryptedMediaTest(const std::string& html_page,
@@ -134,12 +136,8 @@
const std::string& media_type,
const std::string& key_system,
SrcType src_type) {
- RunEncryptedMediaTest(kDefaultEmePlayer,
- media_file,
- media_type,
- key_system,
- src_type,
- kEnded);
+ RunEncryptedMediaTest(kDefaultEmePlayer, media_file, media_type, key_system,
+ src_type, media::kEnded);
}
protected:
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
index 1345092..616fe408 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -21,19 +21,6 @@
namespace content {
-// TODO(sandersd): Change the tests to use a more unique message.
-// See http://crbug.com/592067
-
-// Common test results.
-const char MediaBrowserTest::kFailed[] = "FAILED";
-
-// Upper case event name set by Utils.installTitleEventHandler().
-const char MediaBrowserTest::kEnded[] = "ENDED";
-const char MediaBrowserTest::kErrorEvent[] = "ERROR";
-
-// Lower case event name as set by Utils.failTest().
-const char MediaBrowserTest::kError[] = "error";
-
#if defined(OS_ANDROID)
// Title set by android cleaner page after short timeout.
const char kClean[] = "CLEAN";
@@ -96,10 +83,10 @@
}
void MediaBrowserTest::AddTitlesToAwait(content::TitleWatcher* title_watcher) {
- title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEnded));
- title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kError));
- title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kErrorEvent));
- title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kFailed));
+ title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(media::kEnded));
+ title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(media::kError));
+ title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(media::kErrorEvent));
+ title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(media::kFailed));
}
// Tests playback and seeking of an audio or video file over file or http based
@@ -124,7 +111,7 @@
bool http) {
base::StringPairs query_params;
query_params.emplace_back(tag, media_file);
- RunMediaTestPage("player.html", query_params, kEnded, http);
+ RunMediaTestPage("player.html", query_params, media::kEnded, http);
}
void RunErrorMessageTest(const std::string& tag,
@@ -135,7 +122,7 @@
query_params.emplace_back(tag, media_file);
query_params.emplace_back("error_substr",
EncodeErrorMessage(expected_error_substring));
- RunMediaTestPage("player.html", query_params, kErrorEvent, http);
+ RunMediaTestPage("player.html", query_params, media::kErrorEvent, http);
}
void RunVideoSizeTest(const char* media_file, int width, int height) {
@@ -247,7 +234,7 @@
#if !defined(OS_ANDROID)
IN_PROC_BROWSER_TEST_F(MediaTest, LoadManyVideos) {
base::StringPairs query_params;
- RunMediaTestPage("load_many_videos.html", query_params, kEnded, true);
+ RunMediaTestPage("load_many_videos.html", query_params, media::kEnded, true);
}
#endif // !defined(OS_ANDROID)
#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
diff --git a/content/browser/media/media_browsertest.h b/content/browser/media/media_browsertest.h
index c2f7047..7e86880 100644
--- a/content/browser/media/media_browsertest.h
+++ b/content/browser/media/media_browsertest.h
@@ -17,12 +17,6 @@
// A base class for media related browser tests.
class MediaBrowserTest : public ContentBrowserTest {
public:
- // Common test results.
- static const char kEnded[];
- static const char kError[];
- static const char kErrorEvent[];
- static const char kFailed[];
-
// ContentBrowserTest implementation.
void SetUpCommandLine(base::CommandLine* command_line) override;
diff --git a/content/browser/media/media_color_browsertest.cc b/content/browser/media/media_color_browsertest.cc
index 82fbe3d..bf60b0e8 100644
--- a/content/browser/media/media_color_browsertest.cc
+++ b/content/browser/media/media_color_browsertest.cc
@@ -15,8 +15,8 @@
void RunColorTest(const std::string& video_file) {
base::FilePath path = media::GetTestDataFilePath("blackwhite.html");
std::string final_title =
- RunTest(GetFileUrlWithQuery(path, video_file), kEnded);
- EXPECT_EQ(kEnded, final_title);
+ RunTest(GetFileUrlWithQuery(path, video_file), media::kEnded);
+ EXPECT_EQ(media::kEnded, final_title);
}
};
diff --git a/content/browser/media/media_redirect_browsertest.cc b/content/browser/media/media_redirect_browsertest.cc
index 93b1ce4..8be45ca 100644
--- a/content/browser/media/media_redirect_browsertest.cc
+++ b/content/browser/media/media_redirect_browsertest.cc
@@ -34,7 +34,7 @@
http_test_server->StartAcceptingConnections();
// Run the normal media playback test.
- EXPECT_EQ(kEnded, RunTest(player_url, kEnded));
+ EXPECT_EQ(media::kEnded, RunTest(player_url, media::kEnded));
}
std::unique_ptr<net::test_server::HttpResponse> RedirectResponseHandler(
diff --git a/content/browser/media/media_source_browsertest.cc b/content/browser/media/media_source_browsertest.cc
index 51e6247..9a63f942 100644
--- a/content/browser/media/media_source_browsertest.cc
+++ b/content/browser/media/media_source_browsertest.cc
@@ -7,6 +7,7 @@
#include "build/build_config.h"
#include "content/browser/media/media_browsertest.h"
#include "media/base/media_switches.h"
+#include "media/base/test_data_util.h"
#include "media/media_features.h"
#if defined(OS_ANDROID)
@@ -56,11 +57,12 @@
};
IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoAudio_WebM) {
- TestSimplePlayback("bear-320x240.webm", kWebMAudioVideo, kEnded);
+ TestSimplePlayback("bear-320x240.webm", kWebMAudioVideo, media::kEnded);
}
IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoOnly_WebM) {
- TestSimplePlayback("bear-320x240-video-only.webm", kWebMVideoOnly, kEnded);
+ TestSimplePlayback("bear-320x240-video-only.webm", kWebMVideoOnly,
+ media::kEnded);
}
// TODO(servolk): Android is supposed to support AAC in ADTS container with
@@ -68,30 +70,32 @@
// some issue in OMX AAC decoder (crbug.com/528361)
#if BUILDFLAG(USE_PROPRIETARY_CODECS) && !defined(OS_ANDROID)
IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_AAC_ADTS) {
- TestSimplePlayback("sfx.adts", kAAC_ADTS_AudioOnly, kEnded);
+ TestSimplePlayback("sfx.adts", kAAC_ADTS_AudioOnly, media::kEnded);
}
#endif
// Opus is not supported in Android as of now.
#if !defined(OS_ANDROID)
IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_Opus_WebM) {
- TestSimplePlayback("bear-opus.webm", kWebMOpusAudioOnly, kEnded);
+ TestSimplePlayback("bear-opus.webm", kWebMOpusAudioOnly, media::kEnded);
}
#endif
IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_WebM) {
- TestSimplePlayback("bear-320x240-audio-only.webm", kWebMAudioOnly, kEnded);
+ TestSimplePlayback("bear-320x240-audio-only.webm", kWebMAudioOnly,
+ media::kEnded);
}
IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Type_Error) {
TestSimplePlayback("bear-320x240-video-only.webm", kWebMAudioOnly,
- kErrorEvent);
+ media::kErrorEvent);
}
// Flaky test crbug.com/246308
// Test changed to skip checks resulting in flakiness. Proper fix still needed.
IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) {
- RunMediaTestPage("mse_config_change.html", base::StringPairs(), kEnded, true);
+ RunMediaTestPage("mse_config_change.html", base::StringPairs(), media::kEnded,
+ true);
}
#if BUILDFLAG(USE_PROPRIETARY_CODECS)
@@ -102,7 +106,8 @@
base::StringPairs query_params;
query_params.push_back(std::make_pair("videoFormat", "CLEAR_MP4"));
query_params.push_back(std::make_pair("audioFormat", "CLEAR_WEBM"));
- RunMediaTestPage("mse_different_containers.html", query_params, kEnded, true);
+ RunMediaTestPage("mse_different_containers.html", query_params, media::kEnded,
+ true);
}
#endif // !defined(OS_ANDROID)
@@ -110,20 +115,21 @@
base::StringPairs query_params;
query_params.push_back(std::make_pair("videoFormat", "CLEAR_WEBM"));
query_params.push_back(std::make_pair("audioFormat", "CLEAR_MP4"));
- RunMediaTestPage("mse_different_containers.html", query_params, kEnded, true);
+ RunMediaTestPage("mse_different_containers.html", query_params, media::kEnded,
+ true);
}
IN_PROC_BROWSER_TEST_F(MediaSourceTest,
Playback_AudioOnly_FLAC_MP4_Unsupported) {
// The feature is disabled by test setup, so verify playback failure.
- TestSimplePlayback("bear-flac_frag.mp4", kMp4FlacAudioOnly, kFailed);
+ TestSimplePlayback("bear-flac_frag.mp4", kMp4FlacAudioOnly, media::kFailed);
}
#endif
#if BUILDFLAG(USE_PROPRIETARY_CODECS)
#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioVideo_Mp2t) {
- TestSimplePlayback("bear-1280x720.ts", kMp2tAudioVideo, kEnded);
+ TestSimplePlayback("bear-1280x720.ts", kMp2tAudioVideo, media::kEnded);
}
#endif
#endif
@@ -142,7 +148,7 @@
IN_PROC_BROWSER_TEST_F(MediaSourceFlacInIsobmffTest,
Playback_AudioOnly_FLAC_MP4_Supported) {
// The feature is enabled by test setup, so verify playback success.
- TestSimplePlayback("bear-flac_frag.mp4", kMp4FlacAudioOnly, kEnded);
+ TestSimplePlayback("bear-flac_frag.mp4", kMp4FlacAudioOnly, media::kEnded);
}
#endif
diff --git a/media/base/test_data_util.cc b/media/base/test_data_util.cc
index 9fc6332..b62990d 100644
--- a/media/base/test_data_util.cc
+++ b/media/base/test_data_util.cc
@@ -25,6 +25,19 @@
0x38, 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35};
}
+// TODO(sandersd): Change the tests to use a more unique message.
+// See http://crbug.com/592067
+
+// Common test results.
+const char kFailed[] = "FAILED";
+
+// Upper case event name set by Utils.installTitleEventHandler().
+const char kEnded[] = "ENDED";
+const char kErrorEvent[] = "ERROR";
+
+// Lower case event name as set by Utils.failTest().
+const char kError[] = "error";
+
const base::FilePath::CharType kTestDataPath[] =
FILE_PATH_LITERAL("media/test/data");
diff --git a/media/base/test_data_util.h b/media/base/test_data_util.h
index b93093b..5924aaa 100644
--- a/media/base/test_data_util.h
+++ b/media/base/test_data_util.h
@@ -17,6 +17,12 @@
class DecoderBuffer;
+// Common test results.
+extern const char kFailed[];
+extern const char kEnded[];
+extern const char kErrorEvent[];
+extern const char kError[];
+
// Returns a file path for a file in the media/test/data directory.
base::FilePath GetTestDataFilePath(const std::string& name);
