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

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

Issue 958683002: Migrate most DataReductionProxyParams methods to be private. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 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
« no previous file with comments | « no previous file | components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h
index 6b96798af8d26a45739b50d7f387dedfa0605247..85e8b6ec9676ee3304854a7ec2eee227226cca69 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h
@@ -5,6 +5,7 @@
#ifndef COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_CONFIG_H_
#define COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_CONFIG_H_
+#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
@@ -77,14 +78,10 @@ class DataReductionProxyConfig
net::NetLog* net_log,
scoped_ptr<DataReductionProxyParams> params,
DataReductionProxyConfigurator* configurator,
- DataReductionProxyEventStore* event_store);
+ DataReductionProxyEventStore* event_store,
+ bool enable_quic);
~DataReductionProxyConfig() override;
- // Returns the underlying |DataReductionProxyParams| instance.
- DataReductionProxyParams* params() const {
- return params_.get();
- }
-
void SetDataReductionProxyService(
base::WeakPtr<DataReductionProxyService> data_reduction_proxy_service);
@@ -148,6 +145,23 @@ class DataReductionProxyConfig
virtual bool ContainsDataReductionProxy(
const net::ProxyConfig::ProxyRules& proxy_rules);
+ // Returns true if the proxy was using the HTTP tunnel for a HTTPS origin.
+ bool UsingHTTPTunnel(const net::HostPortPair& proxy_server) const;
+
+ // Returns the Data Reduction Proxy primary origin.
+ const net::ProxyServer& Origin();
+
+ // Returns true if the Data Reduction Proxy configuration may be used.
+ bool allowed();
+
+ // Returns true if the alternative Data Reduction Proxy configuration may be
+ // used.
+ bool alternative_allowed();
+
+ // Returns true if the Data Reduction Proxy promo may be shown. This is not
+ // tied to whether the Data Reduction Proxy is enabled.
+ bool promo_allowed();
+
protected:
// Sets the proxy configs, enabling or disabling the proxy according to
// the value of |enabled| and |alternative_enabled|. Use the alternative
@@ -177,6 +191,8 @@ class DataReductionProxyConfig
friend class MockDataReductionProxyConfig;
friend class TestDataReductionProxyConfig;
FRIEND_TEST_ALL_PREFIXES(DataReductionProxyConfigTest,
+ TestGetDataReductionProxies);
+ FRIEND_TEST_ALL_PREFIXES(DataReductionProxyConfigTest,
TestOnIPAddressChanged);
FRIEND_TEST_ALL_PREFIXES(DataReductionProxyConfigTest,
TestSetProxyConfigsHoldback);
« no previous file with comments | « no previous file | components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698