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

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc

Issue 1024553009: Add the ability to use DataReductionProxyParams from DataReductionProxyConfigServiceClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@client_control_local
Patch Set: Address sclittle comment Created 5 years, 9 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: components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc
index 57b79f7761eca09e00aefd9f436343e7aa180a3e..b957ab591e69eb32217c4936e3cac9f161646c9a 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc
@@ -10,9 +10,11 @@
#include "base/single_thread_task_runner.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
@@ -46,12 +48,32 @@ DataReductionProxyIOData::DataReductionProxyIOData(
event_store_.reset(new DataReductionProxyEventStore(ui_task_runner));
configurator_.reset(new DataReductionProxyConfigurator(
io_task_runner, net_log, event_store_.get()));
- config_.reset(new DataReductionProxyConfig(
- io_task_runner_, ui_task_runner_, net_log, params.Pass(),
- configurator_.get(), event_store_.get()));
+ bool use_config_client = DataReductionProxyParams::IsConfigClientEnabled();
+ DataReductionProxyMutableConfigValues* raw_mutable_config = nullptr;
+ if (use_config_client) {
+ scoped_ptr<DataReductionProxyMutableConfigValues> mutable_config =
+ DataReductionProxyMutableConfigValues::CreateFromParams(io_task_runner_,
+ params.get());
+ raw_mutable_config = mutable_config.get();
+ config_.reset(new DataReductionProxyConfig(
+ io_task_runner_, ui_task_runner_, net_log, mutable_config.Pass(),
+ configurator_.get(), event_store_.get()));
+ } else {
+ config_.reset(new DataReductionProxyConfig(
+ io_task_runner_, ui_task_runner_, net_log, params.Pass(),
+ configurator_.get(), event_store_.get()));
+ }
+
request_options_.reset(new DataReductionProxyRequestOptions(
client_, config_.get(), io_task_runner_));
request_options_->Init();
+
+ if (use_config_client) {
+ config_client_.reset(new DataReductionProxyConfigServiceClient(
+ params.Pass(), GetBackoffPolicy(), request_options_.get(),
+ raw_mutable_config, config_.get(), io_task_runner_));
+ }
+
proxy_delegate_.reset(
new DataReductionProxyDelegate(request_options_.get(), config_.get()));
}

Powered by Google App Engine
This is Rietveld 408576698