Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h |
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h |
index 5343635bebb1ae74a9488036be7ebbaa1b81b1fd..e79d4a7d8b084605be32bf091a0c1ab0c0f1e4ab 100644 |
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h |
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h |
@@ -10,7 +10,6 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/threading/non_thread_safe.h" |
-#include "net/url_request/url_fetcher_delegate.h" |
class GURL; |
class PrefService; |
@@ -20,25 +19,15 @@ class SequencedTaskRunner; |
class TimeDelta; |
} |
-namespace net { |
-class URLFetcher; |
-class URLRequestContextGetter; |
-class URLRequestStatus; |
-} |
- |
namespace data_reduction_proxy { |
-typedef base::Callback<void(const std::string&, const net::URLRequestStatus&)> |
- FetcherResponseCallback; |
- |
class DataReductionProxySettings; |
class DataReductionProxyStatisticsPrefs; |
// Contains and initializes all Data Reduction Proxy objects that have a |
// lifetime based on the UI thread. |
-class DataReductionProxyService : public base::NonThreadSafe, |
- public net::URLFetcherDelegate { |
+class DataReductionProxyService : public base::NonThreadSafe { |
public: |
// The caller must ensure that |settings| and |request_context| remain alive |
// for the lifetime of the |DataReductionProxyService| instance. This instance |
@@ -47,19 +36,12 @@ class DataReductionProxyService : public base::NonThreadSafe, |
// DataReductionProxySettings and not vice versa. |
DataReductionProxyService( |
scoped_ptr<DataReductionProxyStatisticsPrefs> statistics_prefs, |
- DataReductionProxySettings* settings, |
- net::URLRequestContextGetter* request_context_getter); |
+ DataReductionProxySettings* settings); |
- ~DataReductionProxyService() override; |
+ ~DataReductionProxyService(); |
void Shutdown(); |
- // Requests the given |secure_proxy_check_url|. Upon completion, returns the |
- // results to the caller via the |fetcher_callback|. Virtualized for unit |
- // testing. |
- virtual void SecureProxyCheck(const GURL& secure_proxy_check_url, |
- FetcherResponseCallback fetcher_callback); |
- |
// Constructs statistics prefs. This should not be called if a valid |
// statistics prefs is passed into the constructor. |
void EnableCompressionStatisticsLogging( |
@@ -77,22 +59,7 @@ class DataReductionProxyService : public base::NonThreadSafe, |
base::WeakPtr<DataReductionProxyService> GetWeakPtr(); |
- protected: |
- // Virtualized for testing. Returns a fetcher to check if it is permitted to |
- // use the secure proxy. |
- virtual net::URLFetcher* GetURLFetcherForSecureProxyCheck( |
- const GURL& secure_proxy_check_url); |
- |
private: |
- // net::URLFetcherDelegate: |
- void OnURLFetchComplete(const net::URLFetcher* source) override; |
- |
- net::URLRequestContextGetter* url_request_context_getter_; |
- |
- // The URLFetcher being used for the secure proxy check. |
- scoped_ptr<net::URLFetcher> fetcher_; |
- FetcherResponseCallback fetcher_callback_; |
- |
// Tracks compression statistics to be displayed to the user. |
scoped_ptr<DataReductionProxyStatisticsPrefs> statistics_prefs_; |