net/spdy/spdy_test_util_common.h - Issue 1547273003: Set trusted SPDY proxy dynamically on per-profile basis

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/spdy/spdy_test_util_common.h

Issue 1547273003: Set trusted SPDY proxy dynamically on per-profile basis (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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

« components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc ('K') | « net/spdy/spdy_session_pool.cc ('k') | net/spdy/spdy_test_util_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/spdy/spdy_test_util_common.h

diff --git a/net/spdy/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h

index 9ef8df5387618f4bfb6f4da34620fb68f75978d1..4bdf9d1056f1aecdd1e556ad2767cc8ee8575ad6 100644

--- a/net/spdy/spdy_test_util_common.h

+++ b/net/spdy/spdy_test_util_common.h

@@ -14,6 +14,7 @@

#include "base/macros.h"

#include "base/memory/ref_counted.h"

#include "base/memory/scoped_ptr.h"

+#include "base/memory/weak_ptr.h"

#include "crypto/ec_private_key.h"

#include "crypto/ec_signature_creator.h"

#include "net/base/completion_callback.h"

@@ -45,6 +46,7 @@ class SpdySessionKey;

class SpdySessionPool;

class SpdyStream;

class SpdyStreamRequest;

+class TrustedSpdyProxyProvider;

// Default upload data used by both, mock objects and framer when creating

// data frames.

@@ -204,7 +206,7 @@ struct SpdySessionDependencies {

size_t stream_max_recv_window_size;

SpdySession::TimeFunc time_func;

NextProtoVector next_protos;

- std::string trusted_spdy_proxy;

+ base::WeakPtr<TrustedSpdyProxyProvider> trusted_spdy_proxy_provider;

bool use_alternative_services;

NetLog* net_log;

};