Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1192)

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h

Issue 1066513005: Use a custom URLRequestContextGetter for performing the secure proxy check. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename a field Created 5 years, 8 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
Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h
index 7e45c1666a2f18e0d177aa56e4d2ebfd7e5223b9..c5b13efc1b72299789cc13d6d1e69d53bf3196f9 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h
@@ -5,6 +5,8 @@
#ifndef COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_IO_DATA_H_
#define COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_IO_DATA_H_
+#include "base/gtest_prod_util.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/prefs/pref_member.h"
@@ -42,7 +44,8 @@ class DataReductionProxyIOData {
net::NetLog* net_log,
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
- bool enable_quic);
+ bool enable_quic,
+ const std::string& user_agent);
virtual ~DataReductionProxyIOData();
@@ -131,6 +134,7 @@ class DataReductionProxyIOData {
private:
friend class TestDataReductionProxyIOData;
+ FRIEND_TEST_ALL_PREFIXES(DataReductionProxyIODataTest, TestConstruction);
// Used for testing.
DataReductionProxyIOData();
@@ -192,6 +196,10 @@ class DataReductionProxyIOData {
// The net::URLRequestContextGetter used for making URL requests.
net::URLRequestContextGetter* url_request_context_getter_;
+ // A net::URLRequestContextGetter used for making secure proxy checks. It
+ // does not use alternate protocols.
+ scoped_refptr<net::URLRequestContextGetter> basic_url_request_context_getter_;
+
base::WeakPtrFactory<DataReductionProxyIOData> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(DataReductionProxyIOData);

Powered by Google App Engine
This is Rietveld 408576698