Fix race condition in DRP

There is a race condition between the IO thread and the UI thread when
DataReductionProxyAuthRequestHandler is constructed on the IO thread and
WebView tries to set the DRP key on the UI thread.

This CL also makes DataReductionProxyAuthRequestHandler ignore empty
DRP key.

BUG=418344

Review URL: https://codereview.chromium.org/614603004

Cr-Commit-Position: refs/heads/master@{#298325}

2 files changed, 9 insertions, 0 deletions

diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index 9487bde..bd6312e 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -283,4 +283,9 @@ net::NetLog* AwURLRequestContextGetter::GetNetLog() {
   return net_log_.get();
 }
 
+void AwURLRequestContextGetter::SetKeyOnIO(const std::string& key) {
+  DCHECK(data_reduction_proxy_auth_request_handler_);
+  data_reduction_proxy_auth_request_handler_->InitAuthentication(key);
+}
+
 }  // namespace android_webview
diff --git a/android_webview/browser/net/aw_url_request_context_getter.h b/android_webview/browser/net/aw_url_request_context_getter.h
index 122cde7..3154b52 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.h
+++ b/android_webview/browser/net/aw_url_request_context_getter.h
@@ -52,6 +52,10 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter {
   // threads (UI and IO).
   net::NetLog* GetNetLog();
 
+  // This should be called before the network stack is ever used. It can be
+  // called again afterwards if the key updates.
+  void SetKeyOnIO(const std::string& key);
+
  private:
   friend class AwBrowserContext;
   virtual ~AwURLRequestContextGetter();