Commit 8dbf74a3 authored by hubbe's avatar hubbe Committed by Commit bot

Enable castv2 perf tests again

.. and switch evil network profile for bad network profile

BUG=356842

Review URL: https://codereview.chromium.org/511393007

Cr-Commit-Position: refs/heads/master@{#292986}
parent 41ddc64a
......@@ -72,7 +72,7 @@ enum TestFlags {
k30fps = 1 << 4, // use 30 fps video
k60fps = 1 << 5, // use 60 fps video
kProxyWifi = 1 << 6, // Run UDP through UDPProxy wifi profile
kProxyEvil = 1 << 7, // Run UDP through UDPProxy evil profile
kProxyBad = 1 << 7, // Run UDP through UDPProxy bad profile
kSlowClock = 1 << 8, // Receiver clock is 10 seconds slow
kFastClock = 1 << 9, // Receiver clock is 10 seconds fast
};
......@@ -314,8 +314,8 @@ class CastV2PerformanceTest
suffix += "_60fps";
if (HasFlag(kProxyWifi))
suffix += "_wifi";
if (HasFlag(kProxyEvil))
suffix += "_evil";
if (HasFlag(kProxyBad))
suffix += "_bad";
if (HasFlag(kSlowClock))
suffix += "_slow";
if (HasFlag(kFastClock))
......@@ -595,7 +595,7 @@ class CastV2PerformanceTest
receiver->Start();
scoped_ptr<media::cast::test::UDPProxy> udp_proxy;
if (HasFlag(kProxyWifi) || HasFlag(kProxyEvil)) {
if (HasFlag(kProxyWifi) || HasFlag(kProxyBad)) {
net::IPEndPoint proxy_end_point = GetFreeLocalPort();
if (HasFlag(kProxyWifi)) {
udp_proxy = media::cast::test::UDPProxy::Create(
......@@ -604,12 +604,12 @@ class CastV2PerformanceTest
media::cast::test::WifiNetwork().Pass(),
media::cast::test::WifiNetwork().Pass(),
NULL);
} else if (HasFlag(kProxyEvil)) {
} else if (HasFlag(kProxyBad)) {
udp_proxy = media::cast::test::UDPProxy::Create(
proxy_end_point,
receiver_end_point,
media::cast::test::EvilNetwork().Pass(),
media::cast::test::EvilNetwork().Pass(),
media::cast::test::BadNetwork().Pass(),
media::cast::test::BadNetwork().Pass(),
NULL);
}
receiver_end_point = proxy_end_point;
......@@ -660,8 +660,7 @@ class CastV2PerformanceTest
} // namespace
// crbug.com/356842
IN_PROC_BROWSER_TEST_P(CastV2PerformanceTest, DISABLED_Performance) {
IN_PROC_BROWSER_TEST_P(CastV2PerformanceTest, Performance) {
RunTest("CastV2Performance");
}
......@@ -676,6 +675,6 @@ INSTANTIATE_TEST_CASE_P(
kUseGpu | k60fps,
kUseGpu | k24fps | kDisableVsync,
kUseGpu | k30fps | kProxyWifi,
kUseGpu | k30fps | kProxyEvil,
kUseGpu | k30fps | kProxyBad,
kUseGpu | k30fps | kSlowClock,
kUseGpu | k30fps | kFastClock));
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment