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

Unified Diff: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h

Issue 792803007: Make Data Reduction Proxy a best effort proxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated tests Created 5 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
Index: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h
deleted file mode 100644
index c84ddccc1e9a0e6a74323a3949e0be5f009ecd43..0000000000000000000000000000000000000000
--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_CONFIGURATOR_H_
-#define CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_CONFIGURATOR_H_
-
-#include <string>
-#include <vector>
-
-#include "base/gtest_prod_util.h"
-#include "base/task_runner.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h"
-#include "net/proxy/proxy_config.h"
-
-namespace base {
-class SequencedTaskRunner;
-}
-
-namespace data_reduction_proxy {
-class DataReductionProxyEventStore;
-}
-
-namespace net {
-class NetLog;
-class ProxyInfo;
-class ProxyService;
-}
-
-class PrefService;
-
-class DataReductionProxyChromeConfigurator
- : public data_reduction_proxy::DataReductionProxyConfigurator {
- public:
- explicit DataReductionProxyChromeConfigurator(
- PrefService* prefs,
- scoped_refptr<base::SequencedTaskRunner> network_task_runner,
- net::NetLog* net_log,
- data_reduction_proxy::DataReductionProxyEventStore* event_store);
- ~DataReductionProxyChromeConfigurator() override;
-
- // Removes the data reduction proxy configuration from the proxy preference.
- // This disables use of the data reduction proxy. This method is public to
- // disable the proxy on incognito. Disable() should be used otherwise.
- static void DisableInProxyConfigPref(PrefService* prefs);
-
- void Enable(bool primary_restricted,
- bool fallback_restricted,
- const std::string& primary_origin,
- const std::string& fallback_origin,
- const std::string& ssl_origin) override;
- void Disable() override;
-
- // Add a host pattern to bypass. This should follow the same syntax used
- // in net::ProxyBypassRules; that is, a hostname pattern, a hostname suffix
- // pattern, an IP literal, a CIDR block, or the magic string '<local>'.
- // Bypass settings persist for the life of this object and are applied
- // each time the proxy is enabled, but are not updated while it is enabled.
- void AddHostPatternToBypass(const std::string& pattern) override;
-
- // Add a URL pattern to bypass the proxy. The base implementation strips
- // everything in |pattern| after the first single slash and then treats it
- // as a hostname pattern. Subclasses may implement other semantics.
- void AddURLPatternToBypass(const std::string& pattern) override;
-
- // Updates the config for use on the IO thread.
- void UpdateProxyConfigOnIOThread(const net::ProxyConfig& config);
-
- // Returns the current data reduction proxy config, even if it is not the
- // effective configuration used by the proxy service.
- const net::ProxyConfig& GetProxyConfigOnIOThread() const;
-
- private:
- FRIEND_TEST_ALL_PREFIXES(DataReductionProxyConfigTest, TestBypassList);
-
- // Check whether the |proxy_rules| contain any of the data reduction proxies.
- static bool ContainsDataReductionProxy(
- const net::ProxyConfig::ProxyRules& proxy_rules);
-
- PrefService* prefs_;
- scoped_refptr<base::SequencedTaskRunner> network_task_runner_;
-
- std::vector<std::string> bypass_rules_;
- net::ProxyConfig config_;
- net::NetLog* net_log_;
- data_reduction_proxy::DataReductionProxyEventStore*
- data_reduction_proxy_event_store_;
-
- DISALLOW_COPY_AND_ASSIGN(DataReductionProxyChromeConfigurator);
-};
-
-#endif // CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_CONFIGURATOR_H_

Powered by Google App Engine
This is Rietveld 408576698