Use data reduction proxy when managed proxy config returns direct

components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc

Index: components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc
index a8536687ef9e95c8010b904d0c78df63bbb3b17e..09f5d2c43e7eccfa675c5a80a891d85f887d288c 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc
@@ -94,7 +94,8 @@ DataReductionProxySettings::DataReductionProxySettings(
       unreachable_(false),
       prefs_(NULL),
       local_state_prefs_(NULL),
-      url_request_context_getter_(NULL) {
+      url_request_context_getter_(NULL),
+      configurator_(NULL) {
   DCHECK(params);
   params_.reset(params);
 }
@@ -149,11 +150,11 @@ void DataReductionProxySettings::InitDataReductionProxySettings(
     PrefService* prefs,
     PrefService* local_state_prefs,
     net::URLRequestContextGetter* url_request_context_getter,
-    scoped_ptr<DataReductionProxyConfigurator> configurator) {
+    DataReductionProxyConfigurator* configurator) {
   InitDataReductionProxySettings(prefs,
                                  local_state_prefs,
                                  url_request_context_getter);
-  SetProxyConfigurator(configurator.Pass());
+  SetProxyConfigurator(configurator);
 }
 
 void DataReductionProxySettings::SetOnDataReductionEnabledCallback(
@@ -163,9 +164,9 @@ void DataReductionProxySettings::SetOnDataReductionEnabledCallback(
 }
 
 void DataReductionProxySettings::SetProxyConfigurator(
-    scoped_ptr<DataReductionProxyConfigurator> configurator) {
+    DataReductionProxyConfigurator* configurator) {
   DCHECK(configurator);
-  configurator_ = configurator.Pass();
+  configurator_ = configurator;
 }
 
 bool DataReductionProxySettings::IsDataReductionProxyEnabled() {