Commit b339a7b1 authored by Matt Menke's avatar Matt Menke Committed by Commit Bot

Make media tests use two argument ResponseHeader manipulation calls

We want to get rid of the single argument AddHeader() method as the two
argument AddHeader() and SetHeader() methods are safer and more
flexible.

Bug: 1068194
Change-Id: I9a9545c5aaedad66ff5b455b27111c714aa9c773
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2146936
Commit-Queue: Takumi Fujimoto <takumif@chromium.org>
Auto-Submit: Matt Menke <mmenke@chromium.org>
Reviewed-by: default avatarTakumi Fujimoto <takumif@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758593}
parent af5e6ef3
...@@ -85,7 +85,7 @@ TEST_F(DeviceDescriptionFetcherTest, FetchSuccessful) { ...@@ -85,7 +85,7 @@ TEST_F(DeviceDescriptionFetcherTest, FetchSuccessful) {
body, GURL("http://127.0.0.1/apps")))); body, GURL("http://127.0.0.1/apps"))));
auto head = network::mojom::URLResponseHead::New(); auto head = network::mojom::URLResponseHead::New();
head->headers = base::MakeRefCounted<net::HttpResponseHeaders>(""); head->headers = base::MakeRefCounted<net::HttpResponseHeaders>("");
head->headers->AddHeader("Application-URL: http://127.0.0.1/apps"); head->headers->AddHeader("Application-URL", "http://127.0.0.1/apps");
network::URLLoaderCompletionStatus status; network::URLLoaderCompletionStatus status;
status.decoded_body_length = body.size(); status.decoded_body_length = body.size();
loader_factory_.AddResponse(url_, std::move(head), body, status); loader_factory_.AddResponse(url_, std::move(head), body, status);
...@@ -98,7 +98,7 @@ TEST_F(DeviceDescriptionFetcherTest, FetchSuccessfulAppUrlWithTrailingSlash) { ...@@ -98,7 +98,7 @@ TEST_F(DeviceDescriptionFetcherTest, FetchSuccessfulAppUrlWithTrailingSlash) {
body, GURL("http://127.0.0.1/apps")))); body, GURL("http://127.0.0.1/apps"))));
auto head = network::mojom::URLResponseHead::New(); auto head = network::mojom::URLResponseHead::New();
head->headers = base::MakeRefCounted<net::HttpResponseHeaders>(""); head->headers = base::MakeRefCounted<net::HttpResponseHeaders>("");
head->headers->AddHeader("Application-URL: http://127.0.0.1/apps/"); head->headers->AddHeader("Application-URL", "http://127.0.0.1/apps/");
network::URLLoaderCompletionStatus status; network::URLLoaderCompletionStatus status;
status.decoded_body_length = body.size(); status.decoded_body_length = body.size();
loader_factory_.AddResponse(url_, std::move(head), body, status); loader_factory_.AddResponse(url_, std::move(head), body, status);
...@@ -128,7 +128,7 @@ TEST_F(DeviceDescriptionFetcherTest, FetchFailsOnEmptyAppUrl) { ...@@ -128,7 +128,7 @@ TEST_F(DeviceDescriptionFetcherTest, FetchFailsOnEmptyAppUrl) {
std::string body("<xml>description</xml>"); std::string body("<xml>description</xml>");
auto head = network::mojom::URLResponseHead::New(); auto head = network::mojom::URLResponseHead::New();
head->headers = base::MakeRefCounted<net::HttpResponseHeaders>(""); head->headers = base::MakeRefCounted<net::HttpResponseHeaders>("");
head->headers->AddHeader("Application-URL:"); head->headers->AddHeader("Application-URL", "");
network::URLLoaderCompletionStatus status; network::URLLoaderCompletionStatus status;
status.decoded_body_length = body.size(); status.decoded_body_length = body.size();
loader_factory_.AddResponse(url_, std::move(head), body, status); loader_factory_.AddResponse(url_, std::move(head), body, status);
...@@ -140,7 +140,7 @@ TEST_F(DeviceDescriptionFetcherTest, FetchFailsOnInvalidAppUrl) { ...@@ -140,7 +140,7 @@ TEST_F(DeviceDescriptionFetcherTest, FetchFailsOnInvalidAppUrl) {
std::string body("<xml>description</xml>"); std::string body("<xml>description</xml>");
auto head = network::mojom::URLResponseHead::New(); auto head = network::mojom::URLResponseHead::New();
head->headers = base::MakeRefCounted<net::HttpResponseHeaders>(""); head->headers = base::MakeRefCounted<net::HttpResponseHeaders>("");
head->headers->AddHeader("Application-URL: http://www.example.com"); head->headers->AddHeader("Application-URL", "http://www.example.com");
network::URLLoaderCompletionStatus status; network::URLLoaderCompletionStatus status;
status.decoded_body_length = body.size(); status.decoded_body_length = body.size();
loader_factory_.AddResponse(url_, std::move(head), body, status); loader_factory_.AddResponse(url_, std::move(head), body, status);
...@@ -151,7 +151,7 @@ TEST_F(DeviceDescriptionFetcherTest, FetchFailsOnEmptyDescription) { ...@@ -151,7 +151,7 @@ TEST_F(DeviceDescriptionFetcherTest, FetchFailsOnEmptyDescription) {
EXPECT_CALL(*this, OnError(HasSubstr("Missing or empty response"))); EXPECT_CALL(*this, OnError(HasSubstr("Missing or empty response")));
auto head = network::mojom::URLResponseHead::New(); auto head = network::mojom::URLResponseHead::New();
head->headers = base::MakeRefCounted<net::HttpResponseHeaders>(""); head->headers = base::MakeRefCounted<net::HttpResponseHeaders>("");
head->headers->AddHeader("Application-URL: http://127.0.0.1/apps"); head->headers->AddHeader("Application-URL", "http://127.0.0.1/apps");
loader_factory_.AddResponse(url_, std::move(head), "", loader_factory_.AddResponse(url_, std::move(head), "",
network::URLLoaderCompletionStatus()); network::URLLoaderCompletionStatus());
...@@ -163,7 +163,7 @@ TEST_F(DeviceDescriptionFetcherTest, FetchFailsOnBadDescription) { ...@@ -163,7 +163,7 @@ TEST_F(DeviceDescriptionFetcherTest, FetchFailsOnBadDescription) {
std::string body("\xfc\x9c\xbf\x80\xbf\x80"); std::string body("\xfc\x9c\xbf\x80\xbf\x80");
auto head = network::mojom::URLResponseHead::New(); auto head = network::mojom::URLResponseHead::New();
head->headers = base::MakeRefCounted<net::HttpResponseHeaders>(""); head->headers = base::MakeRefCounted<net::HttpResponseHeaders>("");
head->headers->AddHeader("Application-URL: http://127.0.0.1/apps"); head->headers->AddHeader("Application-URL", "http://127.0.0.1/apps");
network::URLLoaderCompletionStatus status; network::URLLoaderCompletionStatus status;
status.decoded_body_length = body.size(); status.decoded_body_length = body.size();
loader_factory_.AddResponse(url_, std::move(head), body, status); loader_factory_.AddResponse(url_, std::move(head), body, status);
......
...@@ -70,8 +70,7 @@ class DialActivityManagerTest : public testing::Test { ...@@ -70,8 +70,7 @@ class DialActivityManagerTest : public testing::Test {
if (app_instance_url) { if (app_instance_url) {
response_head->headers = response_head->headers =
base::MakeRefCounted<net::HttpResponseHeaders>(""); base::MakeRefCounted<net::HttpResponseHeaders>("");
response_head->headers->AddHeader("LOCATION: " + response_head->headers->AddHeader("LOCATION", app_instance_url->spec());
app_instance_url->spec());
} }
loader_factory_.AddResponse(activity.launch_info.app_launch_url, loader_factory_.AddResponse(activity.launch_info.app_launch_url,
std::move(response_head), "", std::move(response_head), "",
......
...@@ -256,7 +256,7 @@ class DialMediaRouteProviderTest : public ::testing::Test { ...@@ -256,7 +256,7 @@ class DialMediaRouteProviderTest : public ::testing::Test {
app_instance_url_ = GURL(app_launch_url.spec() + "/run"); app_instance_url_ = GURL(app_launch_url.spec() + "/run");
auto response_head = network::mojom::URLResponseHead::New(); auto response_head = network::mojom::URLResponseHead::New();
response_head->headers = base::MakeRefCounted<net::HttpResponseHeaders>(""); response_head->headers = base::MakeRefCounted<net::HttpResponseHeaders>("");
response_head->headers->AddHeader("LOCATION: " + app_instance_url_.spec()); response_head->headers->AddHeader("LOCATION", app_instance_url_.spec());
loader_factory_.AddResponse(app_launch_url, std::move(response_head), "", loader_factory_.AddResponse(app_launch_url, std::move(response_head), "",
network::URLLoaderCompletionStatus()); network::URLLoaderCompletionStatus());
std::vector<MediaRoute> routes; std::vector<MediaRoute> routes;
......
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