| Index: net/url_request/url_request_unittest.cc
|
| diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
|
| index c1cefe40e2a65f3d1ca1f3b20778b4ce7b4d678d..dff7ef42cdd4394bbe674a6f56e40490083aea54 100644
|
| --- a/net/url_request/url_request_unittest.cc
|
| +++ b/net/url_request/url_request_unittest.cc
|
| @@ -3298,7 +3298,8 @@ TEST_F(URLRequestTestHTTP, DefaultAcceptLanguage) {
|
| TestNetworkDelegate network_delegate; // must outlive URLRequests
|
| TestURLRequestContext context(true);
|
| context.set_network_delegate(&network_delegate);
|
| - context.set_accept_language("en");
|
| + ConstHttpUserAgentSettings settings("en", EmptyString(), EmptyString());
|
| + context.set_http_user_agent_settings(&settings);
|
| context.Init();
|
|
|
| TestDelegate d;
|
| @@ -3319,7 +3320,8 @@ TEST_F(URLRequestTestHTTP, EmptyAcceptLanguage) {
|
| context.Init();
|
| // We override the language after initialization because empty entries
|
| // get overridden by Init().
|
| - context.set_accept_language("");
|
| + ConstHttpUserAgentSettings settings("", EmptyString(), EmptyString());
|
| + context.set_http_user_agent_settings(&settings);
|
|
|
| TestDelegate d;
|
| URLRequest req(
|
| @@ -3386,7 +3388,8 @@ TEST_F(URLRequestTestHTTP, DefaultAcceptCharset) {
|
| TestNetworkDelegate network_delegate; // must outlive URLRequests
|
| TestURLRequestContext context(true);
|
| context.set_network_delegate(&network_delegate);
|
| - context.set_accept_charset("en");
|
| + ConstHttpUserAgentSettings settings(EmptyString(), "en", EmptyString());
|
| + context.set_http_user_agent_settings(&settings);
|
| context.Init();
|
|
|
| TestDelegate d;
|
| @@ -3408,7 +3411,8 @@ TEST_F(URLRequestTestHTTP, EmptyAcceptCharset) {
|
| context.Init();
|
| // We override the accepted charset after initialization because empty
|
| // entries get overridden otherwise.
|
| - context.set_accept_charset("");
|
| + ConstHttpUserAgentSettings settings(EmptyString(), "", EmptyString());
|
| + context.set_http_user_agent_settings(&settings);
|
|
|
| TestDelegate d;
|
| URLRequest req(test_server_.GetURL("echoheader?Accept-Charset"),
|
|
|