Provide mutable members of UrlRequestContext via pure-virtual interface

net/url_request/url_request_context.h

 // 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.
 
 // This class represents contextual information (cookies, cache, etc.)
 // that's useful when processing resource requests.
 // The class is reference-counted so that it can be cleaned up after any
 // requests that are using it have been completed.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_CONTEXT_H_
@@ skipping 15 matching lines @@
 #include "net/url_request/url_request.h"
 
 namespace net {
 class CertVerifier;
 class CookieStore;
 class FraudulentCertificateReporter;
 class FtpTransactionFactory;
 class HostResolver;
 class HttpAuthHandlerFactory;
 class HttpTransactionFactory;
+class HttpUserAgentSettings;
 class NetworkDelegate;
 class ServerBoundCertService;
 class ProxyService;
 class URLRequest;
 class URLRequestJobFactory;
 class URLRequestThrottlerManager;
 
 // Subclass to provide application-specific context for URLRequest
 // instances. Note that URLRequestContext typically does not provide storage for
 // these member variables, since they may be shared. For the ones that aren't
@@ skipping 119 matching lines @@
 
   // Gets the FTP authentication cache for this context.
   FtpAuthCache* ftp_auth_cache() const {
 #if !defined(DISABLE_FTP_SUPPORT)
     return ftp_auth_cache_.get();
 #else
     return NULL;
 #endif
   }
 
+  // ---------------------------------------------------------------------------
+  // Legacy accessors that delegate to http_user_agent_settings_.
+  // TODO(pauljensen): Remove after all clients are updated to directly access
+  // http_user_agent_settings_.
   // Gets the value of 'Accept-Charset' header field.
-  const std::string& accept_charset() const { return accept_charset_; }
-  void set_accept_charset(const std::string& accept_charset) {
-    accept_charset_ = accept_charset;
-  }
-
+  std::string GetAcceptCharset() const;
   // Gets the value of 'Accept-Language' header field.
-  const std::string& accept_language() const { return accept_language_; }
-  void set_accept_language(const std::string& accept_language) {
-    accept_language_ = accept_language;
-  }
-
+  std::string GetAcceptLanguage() const;
   // Gets the UA string to use for the given URL.  Pass an invalid URL (such as
-  // GURL()) to get the default UA string.  Subclasses should override this
-  // method to provide a UA string.
-  virtual const std::string& GetUserAgent(const GURL& url) const;
+  // GURL()) to get the default UA string.
+  std::string GetUserAgent(const GURL& url) const;
+  // ---------------------------------------------------------------------------
 
   // In general, referrer_charset is not known when URLRequestContext is
   // constructed. So, we need a setter.
   const std::string& referrer_charset() const { return referrer_charset_; }
   void set_referrer_charset(const std::string& charset) {
     referrer_charset_ = charset;
   }
 
   const URLRequestJobFactory* job_factory() const { return job_factory_; }
   void set_job_factory(const URLRequestJobFactory* job_factory) {
     job_factory_ = job_factory;
   }
 
   // May be NULL.
   URLRequestThrottlerManager* throttler_manager() const {
     return throttler_manager_;
   }
   void set_throttler_manager(URLRequestThrottlerManager* throttler_manager) {
     throttler_manager_ = throttler_manager;
   }
 
   // Gets the URLRequest objects that hold a reference to this
   // URLRequestContext.
   std::set<const URLRequest*>* url_requests() const {
     return url_requests_.get();
   }
 
   void AssertNoURLRequests() const;
 
+  // Get the underlying |HttpUserAgentSettings| implementation that provides
+  // the HTTP Accept-Language, Accept-Charset and User-Agent header values.
+  HttpUserAgentSettings* http_user_agent_settings() const {

[willchan no longer on Chromium, 2012/10/24 03:40:10]

Can we return const HttpUserAgentSettings*, or do we need it to be non-const
somewhere?

[pauljensen, 2012/10/24 19:19:00]

If the getters are not const, then this cannot be const.

+    return http_user_agent_settings_;
+  }
+  void set_http_user_agent_settings(
+      HttpUserAgentSettings* http_user_agent_settings) {
+    http_user_agent_settings_ = http_user_agent_settings;
+  }
+
  private:
   // ---------------------------------------------------------------------------
   // Important: When adding any new members below, consider whether they need to
   // be added to CopyFrom.
   // ---------------------------------------------------------------------------
 
   // Ownership for these members are not defined here. Clients should either
   // provide storage elsewhere or have a subclass take ownership.
   NetLog* net_log_;
   HostResolver* host_resolver_;
   CertVerifier* cert_verifier_;
   ServerBoundCertService* server_bound_cert_service_;
   FraudulentCertificateReporter* fraudulent_certificate_reporter_;
   HttpAuthHandlerFactory* http_auth_handler_factory_;
   ProxyService* proxy_service_;
   scoped_refptr<SSLConfigService> ssl_config_service_;
   NetworkDelegate* network_delegate_;
   HttpServerProperties* http_server_properties_;
   scoped_refptr<CookieStore> cookie_store_;
   TransportSecurityState* transport_security_state_;
 #if !defined(DISABLE_FTP_SUPPORT)
   scoped_ptr<FtpAuthCache> ftp_auth_cache_;
 #endif
-  std::string accept_language_;
-  std::string accept_charset_;
   // The charset of the referrer where this request comes from. It's not
   // used in communication with a server but is used to construct a suggested
   // filename for file download.
   std::string referrer_charset_;
   HttpTransactionFactory* http_transaction_factory_;
   FtpTransactionFactory* ftp_transaction_factory_;
   const URLRequestJobFactory* job_factory_;
   URLRequestThrottlerManager* throttler_manager_;
+  HttpUserAgentSettings* http_user_agent_settings_;

[willchan no longer on Chromium, 2012/10/24 03:40:10]

Please move this next to HttpServerProperties.

I'd like to have things *sort* of resemble an order where the lowest level
dependencies (like NetLog, which all net submodules use) are declared first, and
make their way up to the URLRequest level stuff like URLRequestJobFactory.

 
   // ---------------------------------------------------------------------------
   // Important: When adding any new members below, consider whether they need to
   // be added to CopyFrom.
   // ---------------------------------------------------------------------------
 
   scoped_ptr<std::set<const URLRequest*> > url_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestContext);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_CONTEXT_H_