Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(624)

Unified Diff: net/url_request/url_request_unittest.cc

Issue 10918279: Provide mutable members of UrlRequestContext via pure-virtual interface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address erikwright's second round of comments. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 17f60297aed0ae98ead58b5435323a1d9be97dfe..350cae489bb4103a657da83d8e7c2ef22bc8163f 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"
@@ -3333,7 +3334,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;
@@ -3354,7 +3356,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(
@@ -3421,7 +3424,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;
@@ -3443,7 +3447,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"),

Powered by Google App Engine
This is Rietveld 408576698