Add Data Saver support to Cronet

net/url_request/url_request_context_builder.cc

Index: net/url_request/url_request_context_builder.cc
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index 303dd1761bfd0312645c30b2e2733390f233effe..2e97f300b7a47121a67a33f722ccf846a53eb7ab 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -33,6 +33,8 @@
 #include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_storage.h"
+#include "net/url_request/url_request_intercepting_job_factory.h"
+#include "net/url_request/url_request_interceptor.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_throttler_manager.h"
 
@@ -231,6 +233,11 @@ void URLRequestContextBuilder::SetSpdyAndQuicEnabled(bool spdy_enabled,
   http_network_session_params_.enable_quic = quic_enabled;
 }
 
+void URLRequestContextBuilder::SetInterceptors(
+    URLRequestInterceptors url_request_interceptors) {
+  url_request_interceptors_ = url_request_interceptors.Pass();
+}
+
 void URLRequestContextBuilder::SetCookieAndChannelIdStores(
       const scoped_refptr<CookieStore>& cookie_store,
       scoped_ptr<ChannelIDService> channel_id_service) {
@@ -409,8 +416,21 @@ URLRequestContext* URLRequestContextBuilder::Build() {
   }
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
-  storage->set_job_factory(job_factory);
-
+  if (!url_request_interceptors_.empty()) {
+    // Set up interceptors in the reverse order.
+    scoped_ptr<net::URLRequestJobFactory> top_job_factory =
+        make_scoped_ptr(job_factory);

[mmenke, 2015/03/13 18:16:48]

make_scoped_ptr not needed.

[bengr, 2015/03/19 01:03:51]

Done.

+    for (URLRequestInterceptors::reverse_iterator i =
+             url_request_interceptors_.rbegin();
+         i != url_request_interceptors_.rend(); ++i) {
+      top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
+          top_job_factory.Pass(), make_scoped_ptr(*i)));
+    }
+    url_request_interceptors_.weak_clear();
+    storage->set_job_factory(top_job_factory.release());
+  } else {
+    storage->set_job_factory(job_factory);
+  }

[mmenke, 2015/03/13 18:16:48]

optional:  Think this would be a little simpler with top_job_factory defined
outside the if block, and no else clause.

[bengr, 2015/03/19 01:03:51]

Done.

   // TODO(willchan): Support sdch.
 
   return context;