Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.h |
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.h |
index 4d9d24b1d7f02c67dd1cfeab4f7c35ac78e0d880..4923f48678f3f69dbfa0831df446c17c6d7ee01d 100644 |
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.h |
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.h |
@@ -7,12 +7,12 @@ |
#include <stdint.h> |
+#include <memory> |
#include <string> |
#include "base/callback.h" |
#include "base/gtest_prod_util.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/threading/thread_checker.h" |
#include "base/time/time.h" |
#include "base/timer/timer.h" |
@@ -89,7 +89,7 @@ class DataReductionProxyConfigServiceClient |
// the |DataReductionProxyConfigClient|, with the exception of |params| |
// which this instance will own. |
DataReductionProxyConfigServiceClient( |
- scoped_ptr<DataReductionProxyParams> params, |
+ std::unique_ptr<DataReductionProxyParams> params, |
const net::BackoffEntry::Policy& backoff_policy, |
DataReductionProxyRequestOptions* request_options, |
DataReductionProxyMutableConfigValues* config_values, |
@@ -171,7 +171,7 @@ class DataReductionProxyConfigServiceClient |
// Returns a fetcher to retrieve the Data Reduction Proxy configuration. |
// |secure_proxy_check_url| is the url from which to retrieve the config. |
// |request_body| is the request body sent to the configuration service. |
- scoped_ptr<net::URLFetcher> GetURLFetcherForConfig( |
+ std::unique_ptr<net::URLFetcher> GetURLFetcherForConfig( |
const GURL& secure_proxy_check_url, |
const std::string& request_body); |
@@ -195,7 +195,7 @@ class DataReductionProxyConfigServiceClient |
void OnApplicationStateChange(base::android::ApplicationState new_state); |
#endif |
- scoped_ptr<DataReductionProxyParams> params_; |
+ std::unique_ptr<DataReductionProxyParams> params_; |
// The caller must ensure that the |request_options_| outlives this instance. |
DataReductionProxyRequestOptions* request_options_; |
@@ -236,7 +236,7 @@ class DataReductionProxyConfigServiceClient |
base::OneShotTimer config_refresh_timer_; |
// A |net::URLFetcher| to retrieve the Data Reduction Proxy configuration. |
- scoped_ptr<net::URLFetcher> fetcher_; |
+ std::unique_ptr<net::URLFetcher> fetcher_; |
// Used to correlate the start and end of requests. |
net::BoundNetLog bound_net_log_; |
@@ -248,7 +248,8 @@ class DataReductionProxyConfigServiceClient |
#if defined(OS_ANDROID) |
// Listens to the application transitions from foreground to background or |
// vice versa. |
- scoped_ptr<base::android::ApplicationStatusListener> app_status_listener_; |
+ std::unique_ptr<base::android::ApplicationStatusListener> |
+ app_status_listener_; |
// True if config needs to be fetched when the application comes to |
// foreground. |