| Index: chrome/browser/renderer_host/data_reduction_proxy_resource_throttle_android.h
|
| diff --git a/chrome/browser/renderer_host/data_reduction_proxy_resource_throttle_android.h b/chrome/browser/renderer_host/data_reduction_proxy_resource_throttle_android.h
|
| index bfa891730440412286bfcb140ccf65aeb842a589..8c0e65dc060fb0572108b9974c148d1d59eccc02 100644
|
| --- a/chrome/browser/renderer_host/data_reduction_proxy_resource_throttle_android.h
|
| +++ b/chrome/browser/renderer_host/data_reduction_proxy_resource_throttle_android.h
|
| @@ -24,8 +24,10 @@ class URLRequest;
|
| } // namepsace net
|
|
|
| // DataReductionProxyResourceThrottle checks that URLs are "safe" before
|
| -// navigating to them. To be considered "safe", a URL must not be tagged as a
|
| -// phishing or malware URL by the SPDY proxy.
|
| +// loading them. To be considered "safe", a URL must not be tagged as a
|
| +// phishing or malware URL by the SPDY proxy. The
|
| +// DataReductionProxyResourceThrottle handles subresources, while main
|
| +// resources are handled by the DataReductionProxyNavigationThrottle.
|
| //
|
| // If the URL is tagged as unsafe, a warning page is shown and the request
|
| // remains suspended. If the user decides to cancel, the request is cancelled.
|
| @@ -51,12 +53,11 @@ class DataReductionProxyResourceThrottle
|
| static DataReductionProxyResourceThrottle* MaybeCreate(
|
| net::URLRequest* request,
|
| content::ResourceContext* resource_context,
|
| - content::ResourceType resource_type,
|
| safe_browsing::SafeBrowsingService* sb_service);
|
|
|
| - DataReductionProxyResourceThrottle(net::URLRequest* request,
|
| - content::ResourceType resource_type,
|
| - safe_browsing::SafeBrowsingService* safe_browsing);
|
| + DataReductionProxyResourceThrottle(
|
| + net::URLRequest* request,
|
| + safe_browsing::SafeBrowsingService* safe_browsing);
|
|
|
| // content::ResourceThrottle implementation (called on IO thread).
|
| void WillRedirectRequest(const net::RedirectInfo& redirect_info,
|
| @@ -70,16 +71,11 @@ class DataReductionProxyResourceThrottle
|
| STATE_DISPLAYING_BLOCKING_PAGE,
|
| };
|
|
|
| - static const char* kUnsafeUrlProceedHeader;
|
| -
|
| ~DataReductionProxyResourceThrottle() override;
|
|
|
| // SafeBrowsingService::UrlCheckCallback implementation.
|
| void OnBlockingPageComplete(bool proceed);
|
|
|
| - // Returns the threat type.
|
| - safe_browsing::SBThreatType CheckUrl();
|
| -
|
| // Starts displaying the safe browsing interstitial page if it is not
|
| // prerendering. Called on the UI thread.
|
| static void StartDisplayingBlockingPage(
|
| @@ -98,8 +94,6 @@ class DataReductionProxyResourceThrottle
|
|
|
| scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_;
|
| net::URLRequest* request_;
|
| - const bool is_subresource_;
|
| - const bool is_subframe_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DataReductionProxyResourceThrottle);
|
| };
|
|
|