Provide mutable members of UrlRequestContext via pure-virtual interface

net/url_request/url_request_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shlobj.h>
 #endif
@@ skipping 35 matching lines @@
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/ocsp/nss_ocsp.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/test/test_server.h"
 #include "net/url_request/ftp_protocol_handler.h"
+#include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_file_dir_job.h"
 #include "net/url_request/url_request_http_job.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_redirect_job.h"
 #include "net/url_request/url_request_test_job.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
@@ skipping 3404 matching lines @@
   req.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ("POST", req.method());
   EXPECT_EQ(kData, d.data_received());
 }
 
 // Check that default A-L header is sent.
 TEST_F(URLRequestTestHTTP, DefaultAcceptLanguage) {
   ASSERT_TRUE(test_server_.Start());
 
+  StaticHttpUserAgentSettings settings("en", EmptyString(), EmptyString());
   TestNetworkDelegate network_delegate;  // must outlive URLRequests
   TestURLRequestContext context(true);
   context.set_network_delegate(&network_delegate);
-  context.set_accept_language("en");
+  context.set_http_user_agent_settings(&settings);
   context.Init();
 
   TestDelegate d;
   URLRequest req(
       test_server_.GetURL("echoheader?Accept-Language"), &d, &context);
   req.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ("en", d.data_received());
 }
 
 // Check that an empty A-L header is not sent. http://crbug.com/77365.
 TEST_F(URLRequestTestHTTP, EmptyAcceptLanguage) {
   ASSERT_TRUE(test_server_.Start());
 
+  StaticHttpUserAgentSettings settings("", EmptyString(), EmptyString());

[mmenke, 2012/10/25 18:06:33]

Shouldn't "" just be EmptyString()?  Suppose using "" does draw attention to it,
but that's what the test name is for, I'd assume.  Sames goes for
EmptyAcceptCharset.

   TestNetworkDelegate network_delegate;  // must outlive URLRequests
   TestURLRequestContext context(true);
   context.set_network_delegate(&network_delegate);
   context.Init();
   // We override the language after initialization because empty entries
   // get overridden by Init().
-  context.set_accept_language("");
+  context.set_http_user_agent_settings(&settings);
 
   TestDelegate d;
   URLRequest req(
       test_server_.GetURL("echoheader?Accept-Language"), &d, &context);
   req.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ("None", d.data_received());
 }
 
 // Check that if request overrides the A-L header, the default is not appended.
@@ skipping 43 matching lines @@
   req.Start();
   MessageLoop::current()->Run();
   EXPECT_FALSE(ContainsString(d.data_received(), "gzip"));
   EXPECT_TRUE(ContainsString(d.data_received(), "identity"));
 }
 
 // Check that default A-C header is sent.
 TEST_F(URLRequestTestHTTP, DefaultAcceptCharset) {
   ASSERT_TRUE(test_server_.Start());
 
+  StaticHttpUserAgentSettings settings(EmptyString(), "en", EmptyString());
   TestNetworkDelegate network_delegate;  // must outlive URLRequests
   TestURLRequestContext context(true);
   context.set_network_delegate(&network_delegate);
-  context.set_accept_charset("en");
+  context.set_http_user_agent_settings(&settings);
   context.Init();
 
   TestDelegate d;
   URLRequest req(test_server_.GetURL("echoheader?Accept-Charset"),
                  &d,
                  &context);
   req.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ("en", d.data_received());
 }
 
 // Check that an empty A-C header is not sent. http://crbug.com/77365.
 TEST_F(URLRequestTestHTTP, EmptyAcceptCharset) {
   ASSERT_TRUE(test_server_.Start());
 
+  StaticHttpUserAgentSettings settings(EmptyString(), "", EmptyString());
   TestNetworkDelegate network_delegate;  // must outlive URLRequests
   TestURLRequestContext context(true);
   context.set_network_delegate(&network_delegate);
   context.Init();
   // We override the accepted charset after initialization because empty
   // entries get overridden otherwise.
-  context.set_accept_charset("");
+  context.set_http_user_agent_settings(&settings);
 
   TestDelegate d;
   URLRequest req(test_server_.GetURL("echoheader?Accept-Charset"),
                  &d,
                  &context);
   req.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ("None", d.data_received());
 }
 
@@ skipping 40 matching lines @@
   headers.SetHeader(HttpRequestHeaders::kUserAgent, "Lynx (textmode)");
   req.SetExtraRequestHeaders(headers);
   req.Start();
   MessageLoop::current()->Run();
   // If the net tests are being run with ChromeFrame then we need to allow for
   // the 'chromeframe' suffix which is added to the user agent before the
   // closing parentheses.
   EXPECT_TRUE(StartsWithASCII(d.data_received(), "Lynx (textmode", true));
 }
 
+// Check that a NULL HttpUserAgentSettings causes the corresponding empty
+// headers to be sent.

[mmenke, 2012/10/25 18:06:33]

That should be "corresponding header to not be sent", right?  At least it
doesn't look to me like we automatically add Language/Charset headers with a
value of "None".

[pauljensen, 2012/10/25 21:30:25]

Its a mix of both empty or missing headers.  We always send a User-Agent header
even if empty but we don't send Accept-Language or Accept-Charset headers.  I've
adjusted the comment.

+TEST_F(URLRequestTestHTTP, EmptyHttpUserAgentSettings) {
+  ASSERT_TRUE(test_server_.Start());
+
+  TestNetworkDelegate network_delegate;  // must outlive URLRequests
+  TestURLRequestContext context(true);
+  context.set_network_delegate(&network_delegate);
+  context.Init();
+  // We override the HttpUserAgentSettings after initialization because empty
+  // entries get overridden by Init().
+  context.set_http_user_agent_settings(NULL);
+
+  struct {
+    const char* request;
+    const char* expected_response;
+  } tests[] = { { "echoheader?Accept-Language", "None" },
+                { "echoheader?Accept-Charset", "None" },
+                { "echoheader?User-Agent", "" } };
+
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); i++) {
+    TestDelegate d;
+    URLRequest req(test_server_.GetURL(tests[i].request), &d, &context);
+    req.Start();
+    MessageLoop::current()->Run();
+    EXPECT_EQ(tests[i].expected_response, d.data_received())
+        << " Request = \"" << tests[i].request << "\"";
+  }
+}
+
 class HTTPSRequestTest : public testing::Test {
  public:
   HTTPSRequestTest() : default_context_(true) {
     default_context_.set_network_delegate(&default_network_delegate_);
     default_context_.Init();
   }
   virtual ~HTTPSRequestTest() {}
 
  protected:
   TestNetworkDelegate default_network_delegate_;  // must outlive URLRequest
@@ skipping 1169 matching lines @@
 
     EXPECT_FALSE(r.is_pending());
     EXPECT_EQ(1, d->response_started_count());
     EXPECT_FALSE(d->received_data_before_response());
     EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size));
   }
 }
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
 }  // namespace net