Commit e7c8e3f4 authored by Wojciech Dzierżanowski's avatar Wojciech Dzierżanowski Committed by Commit Bot

Remove redundant OnTaskRunnerDeleter for DRP throttles

As of https://chromium-review.googlesource.com/c/chromium/src/+/1731919,
ChromeContentBrowserClient never creates
DataReductionProxyThrottleManager outside of the UI thread.  Thus, the
use of OnTaskRunnerDeleter is now redundant.

Bug: 824840

Change-Id: I1a38f1898d58cb60dd87896cfa14205f7ac0d426
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1829197Reviewed-by: default avatarClark DuVall <cduvall@chromium.org>
Commit-Queue: Wojciech Dzierżanowski <wdzierzanowski@opera.com>
Cr-Commit-Position: refs/heads/master@{#700849}
parent 0af6ddd4
......@@ -1097,10 +1097,7 @@ blink::UserAgentMetadata GetUserAgentMetadata() {
ChromeContentBrowserClient::ChromeContentBrowserClient(
StartupData* startup_data)
: data_reduction_proxy_throttle_manager_(
nullptr,
base::OnTaskRunnerDeleter(nullptr)),
startup_data_(startup_data) {
: startup_data_(startup_data) {
#if BUILDFLAG(ENABLE_PLUGINS)
for (size_t i = 0; i < base::size(kPredefinedAllowedDevChannelOrigins); ++i)
allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]);
......@@ -4535,16 +4532,13 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
data_reduction_proxy::params::IsEnabledWithNetworkService() &&
drp_settings) {
if (!data_reduction_proxy_throttle_manager_) {
data_reduction_proxy_throttle_manager_ = std::unique_ptr<
data_reduction_proxy::DataReductionProxyThrottleManager,
base::OnTaskRunnerDeleter>(
new data_reduction_proxy::DataReductionProxyThrottleManager(
drp_settings->data_reduction_proxy_service(),
data_reduction_proxy::DataReductionProxyThrottleManager::
CreateConfig(drp_settings->data_reduction_proxy_service()
->config()
->GetProxiesForHttp())),
base::OnTaskRunnerDeleter(base::SequencedTaskRunnerHandle::Get()));
data_reduction_proxy_throttle_manager_ = std::make_unique<
data_reduction_proxy::DataReductionProxyThrottleManager>(
drp_settings->data_reduction_proxy_service(),
data_reduction_proxy::DataReductionProxyThrottleManager::CreateConfig(
drp_settings->data_reduction_proxy_service()
->config()
->GetProxiesForHttp()));
}
net::HttpRequestHeaders headers;
data_reduction_proxy::DataReductionProxyRequestOptions::
......
......@@ -18,7 +18,6 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/sequenced_task_runner.h"
#include "build/build_config.h"
#include "chrome/browser/startup_data.h"
#include "content/public/browser/content_browser_client.h"
......@@ -692,8 +691,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
scoped_refptr<safe_browsing::UrlCheckerDelegate>
safe_browsing_url_checker_delegate_;
std::unique_ptr<data_reduction_proxy::DataReductionProxyThrottleManager,
base::OnTaskRunnerDeleter>
std::unique_ptr<data_reduction_proxy::DataReductionProxyThrottleManager>
data_reduction_proxy_throttle_manager_;
std::unique_ptr<service_manager::BinderRegistry> frame_interfaces_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment