Use data reduction proxy when managed proxy config returns direct

android_webview/browser/aw_browser_context.cc

Index: android_webview/browser/aw_browser_context.cc
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 9b510e56e984e23560b7fcb3b15e757991df02e2..262662439c430db6c7d14afc9626af7b5fae45a2 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -113,14 +113,15 @@ void AwBrowserContext::PreMainMessageLoopRun() {
                       BrowserThread::GetMessageLoopProxyForThread(
                           BrowserThread::IO),
                           NULL /* Ignored on Android */)).Pass()));
-    if (data_reduction_proxy_settings_.get()) {
-    scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator>
-        configurator(new data_reduction_proxy::DataReductionProxyConfigTracker(
-            base::Bind(&DataReductionProxyConfigService::UpdateProxyConfig,
-                       base::Unretained(
-                           data_reduction_proxy_config_service.get())),
+  if (data_reduction_proxy_settings_.get()) {
+      data_reduction_proxy_configurator_.reset(
+          new data_reduction_proxy::DataReductionProxyConfigTracker(
+              base::Bind(&DataReductionProxyConfigService::UpdateProxyConfig,
+                         base::Unretained(
+                             data_reduction_proxy_config_service.get())),
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
-    data_reduction_proxy_settings_->SetProxyConfigurator(configurator.Pass());
+    data_reduction_proxy_settings_->SetProxyConfigurator(
+        data_reduction_proxy_configurator_.get());
   }
 
   url_request_context_getter_ =