Remove static variables from HttpStreamFactory.

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_
 #define NET_URL_REQUEST_URL_REQUEST_CONTEXT_H_
 
 #include <set>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/transport_security_state.h"
+#include "net/http/http_network_session.h"
 #include "net/http/http_server_properties.h"
 #include "net/ftp/ftp_auth_cache.h"
 #include "net/url_request/url_request.h"
 
 namespace net {
 class CertVerifier;
 class CookieStore;
 class FraudulentCertificateReporter;
 class FtpTransactionFactory;
 class HostResolver;
@@ skipping 12 matching lines @@
 // shared, URLRequestContextStorage can be helpful in defining their storage.
 class NET_EXPORT URLRequestContext
     : NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   URLRequestContext();
   virtual ~URLRequestContext();
 
   // Copies the state from |other| into this context.
   void CopyFrom(const URLRequestContext* other);
 
+  // If this context has an associated network session, populate params from the
+  // network session and return true.
+  bool GetReferenceParams(HttpNetworkSession::Params* params) const;

[mmenke, 2012/09/04 17:43:13]

Is a copy really necessary?  Seems like we could just return a const pointer.

[mmenke, 2012/09/04 17:43:13]

Suggest calling this GetNetworkSessionParams, since that's what it actually
does, and it may be useful in more cases than for just copying parts of the
SessionParams.

[szager1, 2012/09/04 19:31:07]

The problem is that the URLRequestContext may not have an associated
HttpNetworkSession at the time this method is called (I have actually seen this
happen in the wild).  In that case, it would have to do something like return a
const reference to a static Params object containing default values.  Which
feels wrong to me; not least because the caller of GetReferenceParams can't tell
whether it actually received the default values, or values that are genuinely
associated with this context.

I could add DCHECK's to this method to ensure that this context has a non-NULL
HttpNetworkSession at the time GetReferenceParams is called, and then make sure
it's never called at the wrong time.  WDYT?

[szager1, 2012/09/04 19:31:07]

Done.

[mmenke, 2012/09/04 19:35:40]

I was thinking something more along the lines of:

const HttpNetworkSession::Params* GetReferenceParams() const;

And have it return NULL if no such params exist.

Returning a bool is nice in that it encourages checking for false, but it's not
strictly necessary.  Suppose you could do something like:

bool GetReferenceParams(HttpNetworkSession::Params* const* params) const;

But that's just weird, ugly, and I'm not event sure I got the syntax right.

+
   URLRequest* CreateRequest(
       const GURL& url, URLRequest::Delegate* delegate) const;
 
   NetLog* net_log() const {
     return net_log_;
   }
 
   void set_net_log(NetLog* net_log) {
     net_log_ = net_log;
   }
@@ skipping 188 matching lines @@
   // ---------------------------------------------------------------------------
 
   scoped_ptr<std::set<const URLRequest*> > url_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestContext);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_CONTEXT_H_