summaryrefslogtreecommitdiffstats
path: root/media/cast/test
diff options
context:
space:
mode:
authorhubbe <hubbe@chromium.org>2014-09-10 12:48:59 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-10 20:16:52 +0000
commit857fde275f2b0e0ef555e83535d0dd3375a70123 (patch)
tree617279ea3b8232a8d0b4195ed201ccca5bfa3e6f /media/cast/test
parent0b5d2481a5dc4f3a1ed812b174a4da8dde1b64c2 (diff)
downloadchromium_src-857fde275f2b0e0ef555e83535d0dd3375a70123.zip
chromium_src-857fde275f2b0e0ef555e83535d0dd3375a70123.tar.gz
chromium_src-857fde275f2b0e0ef555e83535d0dd3375a70123.tar.bz2
Cast: Let the extension control if DSCP is on or off.
Extension now has to call udptransport->setOptions(":DSCP") to get dscp set. This framework should also let us experiment with different wifi settings in windows and different pacing settings. Review URL: https://codereview.chromium.org/551883004 Cr-Commit-Position: refs/heads/master@{#294211}
Diffstat (limited to 'media/cast/test')
-rw-r--r--media/cast/test/cast_benchmarks.cc1
-rw-r--r--media/cast/test/end2end_unittest.cc1
-rw-r--r--media/cast/test/sender.cc1
-rw-r--r--media/cast/test/simulator.cc1
4 files changed, 4 insertions, 0 deletions
diff --git a/media/cast/test/cast_benchmarks.cc b/media/cast/test/cast_benchmarks.cc
index deec12c..6a6f8b2 100644
--- a/media/cast/test/cast_benchmarks.cc
+++ b/media/cast/test/cast_benchmarks.cc
@@ -302,6 +302,7 @@ class RunOneBenchmark {
NULL,
testing_clock_sender_,
dummy_endpoint,
+ make_scoped_ptr(new base::DictionaryValue),
base::Bind(&UpdateCastTransportStatus),
base::Bind(&IgnoreRawEvents),
base::TimeDelta::FromSeconds(1),
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index 0580d2c..d673f09 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -596,6 +596,7 @@ class End2EndTest : public ::testing::Test {
NULL,
testing_clock_sender_,
dummy_endpoint,
+ make_scoped_ptr(new base::DictionaryValue),
base::Bind(&UpdateCastTransportStatus),
base::Bind(&End2EndTest::LogRawEvents, base::Unretained(this)),
base::TimeDelta::FromMilliseconds(1),
diff --git a/media/cast/test/sender.cc b/media/cast/test/sender.cc
index a904222..a84bd28 100644
--- a/media/cast/test/sender.cc
+++ b/media/cast/test/sender.cc
@@ -322,6 +322,7 @@ int main(int argc, char** argv) {
NULL, // net log.
cast_environment->Clock(),
remote_endpoint,
+ make_scoped_ptr(new base::DictionaryValue), // options
base::Bind(&UpdateCastTransportStatus),
base::Bind(&LogRawEvents, cast_environment),
base::TimeDelta::FromSeconds(1),
diff --git a/media/cast/test/simulator.cc b/media/cast/test/simulator.cc
index 39ff725..b432b61 100644
--- a/media/cast/test/simulator.cc
+++ b/media/cast/test/simulator.cc
@@ -259,6 +259,7 @@ void RunSimulation(const base::FilePath& source_path,
NULL,
&testing_clock,
net::IPEndPoint(),
+ make_scoped_ptr(new base::DictionaryValue),
base::Bind(&UpdateCastTransportStatus),
base::Bind(&LogTransportEvents, sender_env),
base::TimeDelta::FromSeconds(1),