| 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..3f86e67f56a1d5e038c8fc89100debf667a3e06d 100644
|
| --- a/net/url_request/url_request_unittest.cc
|
| +++ b/net/url_request/url_request_unittest.cc
|
| @@ -52,6 +52,7 @@
|
| #include "net/proxy/proxy_service.h"
|
| #include "net/socket/ssl_client_socket.h"
|
| #include "net/test/test_server.h"
|
| +#include "net/url_request/const_http_user_agent_settings.h"
|
| #include "net/url_request/ftp_protocol_handler.h"
|
| #include "net/url_request/url_request.h"
|
| #include "net/url_request/url_request_file_dir_job.h"
|
| @@ -3298,7 +3299,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 +3321,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 +3389,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 +3412,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"),
|
|
|