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

Unified Diff: components/cronet/android/cronet_url_request_context_adapter.cc

Issue 1112513003: Put Data Reduction Proxy support in Cronet behind a gyp flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cronet
Patch Set: Addressed comments Created 5 years, 7 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/cronet/android/cronet_url_request_context_adapter.cc
diff --git a/components/cronet/android/cronet_url_request_context_adapter.cc b/components/cronet/android/cronet_url_request_context_adapter.cc
index 7863b2b6494eaaa872706bbc8dae357b9a6eb7ed..2f736a9dc1c3161d501ad938a1c01dbe468e7cf1 100644
--- a/components/cronet/android/cronet_url_request_context_adapter.cc
+++ b/components/cronet/android/cronet_url_request_context_adapter.cc
@@ -13,7 +13,6 @@
#include "base/memory/scoped_vector.h"
#include "base/single_thread_task_runner.h"
#include "base/values.h"
-#include "components/cronet/android/cronet_data_reduction_proxy.h"
#include "components/cronet/url_request_context_config.h"
#include "jni/CronetUrlRequestContext_jni.h"
#include "net/base/load_flags.h"
@@ -27,6 +26,10 @@
#include "net/url_request/url_request_context_builder.h"
#include "net/url_request/url_request_interceptor.h"
+#if defined(DATA_REDUCTION_PROXY_SUPPORT)
+#include "components/cronet/android/cronet_data_reduction_proxy.h"
+#endif
+
namespace {
class BasicNetworkDelegate : public net::NetworkDelegateImpl {
@@ -157,6 +160,7 @@ void CronetURLRequestContextAdapter::InitializeOnNetworkThread(
scoped_ptr<net::NetLog> net_log(new net::NetLog);
scoped_ptr<net::NetworkDelegate> network_delegate(new BasicNetworkDelegate());
+#if defined(DATA_REDUCTION_PROXY_SUPPORT)
DCHECK(!data_reduction_proxy_);
// For now, the choice to enable the data reduction proxy happens once,
// at initialization. It cannot be disabled thereafter.
@@ -176,6 +180,7 @@ void CronetURLRequestContextAdapter::InitializeOnNetworkThread(
interceptors.push_back(data_reduction_proxy_->CreateInterceptor());
context_builder.SetInterceptors(interceptors.Pass());
}
+#endif // defined(DATA_REDUCTION_PROXY_SUPPORT)
context_builder.set_network_delegate(network_delegate.release());
context_builder.set_net_log(net_log.release());
context_builder.set_proxy_config_service(proxy_config_service_.release());
@@ -241,8 +246,10 @@ void CronetURLRequestContextAdapter::InitializeOnNetworkThread(
Java_CronetUrlRequestContext_initNetworkThread(
env, jcronet_url_request_context.obj());
+#if defined(DATA_REDUCTION_PROXY_SUPPORT)
if (data_reduction_proxy_)
data_reduction_proxy_->Init(true, GetURLRequestContext());
+#endif
is_context_initialized_ = true;
while (!tasks_waiting_for_context_.empty()) {
tasks_waiting_for_context_.front().Run();

Powered by Google App Engine
This is Rietveld 408576698