Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / android_webview / browser / net / aw_network_delegate.cc

diff --git a/src/android_webview/browser/net/aw_network_delegate.cc b/src/android_webview/browser/net/aw_network_delegate.cc
index b3fb3fa..8c184c6 100644 (file)
--- a/src/android_webview/browser/net/aw_network_delegate.cc
+++ b/src/android_webview/browser/net/aw_network_delegate.cc
@@ -6,14 +6,20 @@
 
 #include "android_webview/browser/aw_cookie_access_policy.h"
 #include "base/android/build_info.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_protocol.h"
 #include "net/base/net_errors.h"
 #include "net/base/completion_callback.h"
+#include "net/proxy/proxy_info.h"
+#include "net/proxy/proxy_server.h"
 #include "net/url_request/url_request.h"
 
 namespace android_webview {
 
-AwNetworkDelegate::AwNetworkDelegate() : data_reduction_proxy_params_(NULL) {
+AwNetworkDelegate::AwNetworkDelegate()
+    : data_reduction_proxy_params_(NULL),
+      data_reduction_proxy_auth_request_handler_(NULL) {
 }
 
 AwNetworkDelegate::~AwNetworkDelegate() {
@@ -38,6 +44,16 @@ int AwNetworkDelegate::OnBeforeSendHeaders(
   return net::OK;
 }
 
+void AwNetworkDelegate::OnBeforeSendProxyHeaders(
+    net::URLRequest* request,
+    const net::ProxyInfo& proxy_info,
+    net::HttpRequestHeaders* headers) {
+  if (data_reduction_proxy_auth_request_handler_) {
+    data_reduction_proxy_auth_request_handler_->MaybeAddRequestHeader(
+        request, proxy_info.proxy_server(), headers);
+  }
+}
+
 void AwNetworkDelegate::OnSendHeaders(net::URLRequest* request,
                                       const net::HttpRequestHeaders& headers) {
 }
@@ -53,7 +69,8 @@ int AwNetworkDelegate::OnHeadersReceived(
       data_reduction_proxy_params_,
       request,
       original_response_headers,
-      override_response_headers);
+      override_response_headers,
+      NULL /* returned bypass type */);
 
   return net::OK;
 }