diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 07:40:26 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 07:40:26 +0000 |
| commit | b9ec68838b984d7ca196263a5f3a071057ee2a5d (patch) | |
| tree | 021db4605a4336486092659234666ae94134f20f /net/spdy/spdy_session.h | |
| parent | 87b3f9184583111b4592a40323c777a467b0c2a2 (diff) | |
| download | chromium_src-b9ec68838b984d7ca196263a5f3a071057ee2a5d.zip chromium_src-b9ec68838b984d7ca196263a5f3a071057ee2a5d.tar.gz chromium_src-b9ec68838b984d7ca196263a5f3a071057ee2a5d.tar.bz2 | |
Cleanup some test ugliness. Stop using a global.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7273065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_session.h')
| -rw-r--r-- | net/spdy/spdy_session.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h index 1fffc9f..5fd3520 100644 --- a/net/spdy/spdy_session.h +++ b/net/spdy/spdy_session.h @@ -57,6 +57,7 @@ class NET_API SpdySession : public base::RefCounted<SpdySession>, SpdySession(const HostPortProxyPair& host_port_proxy_pair, SpdySessionPool* spdy_session_pool, SpdySettingsStorage* spdy_settings, + bool verify_domain_authentication, NetLog* net_log); const HostPortPair& host_port_pair() const { @@ -204,7 +205,6 @@ class NET_API SpdySession : public base::RefCounted<SpdySession>, private: friend class base::RefCounted<SpdySession>; FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, GetActivePushStream); - friend class HttpNetworkTransactionTest; struct PendingCreateStream { PendingCreateStream(const GURL& url, RequestPriority priority, @@ -331,8 +331,6 @@ class NET_API SpdySession : public base::RefCounted<SpdySession>, size_t len); virtual void OnControl(const spdy::SpdyControlFrame* frame); - static bool SetDomainVerification(bool value); - // Callbacks for the Spdy session. CompletionCallbackImpl<SpdySession> read_callback_; CompletionCallbackImpl<SpdySession> write_callback_; @@ -435,10 +433,12 @@ class NET_API SpdySession : public base::RefCounted<SpdySession>, BoundNetLog net_log_; + // Outside of tests, this should always be true. + bool verify_domain_authentication_; + static bool use_ssl_; static bool use_flow_control_; static size_t max_concurrent_stream_limit_; - static bool verify_domain_authentication_; }; class NetLogSpdySynParameter : public NetLog::EventParameters { |