Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h |
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h |
index 4cf18f6cb40c19e218119bb8f8e8affe5ff48d4e..f62fd8ba849f279ea94850f057f7c123fcb0aa4c 100644 |
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h |
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h |
@@ -7,13 +7,13 @@ |
#include <stdint.h> |
+#include <memory> |
#include <string> |
#include "base/callback.h" |
#include "base/gtest_prod_util.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/observer_list.h" |
#include "base/sequenced_task_runner.h" |
@@ -59,7 +59,7 @@ class DataReductionProxyService |
DataReductionProxySettings* settings, |
PrefService* prefs, |
net::URLRequestContextGetter* request_context_getter, |
- scoped_ptr<DataStore> store, |
+ std::unique_ptr<DataStore> store, |
const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner, |
const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner, |
const scoped_refptr<base::SequencedTaskRunner>& db_task_runner, |
@@ -93,11 +93,12 @@ class DataReductionProxyService |
const std::string& mime_type); |
// Overrides of DataReductionProxyEventStorageDelegate. |
- void AddEvent(scoped_ptr<base::Value> event) override; |
- void AddEnabledEvent(scoped_ptr<base::Value> event, bool enabled) override; |
- void AddEventAndSecureProxyCheckState(scoped_ptr<base::Value> event, |
+ void AddEvent(std::unique_ptr<base::Value> event) override; |
+ void AddEnabledEvent(std::unique_ptr<base::Value> event, |
+ bool enabled) override; |
+ void AddEventAndSecureProxyCheckState(std::unique_ptr<base::Value> event, |
SecureProxyCheckState state) override; |
- void AddAndSetLastBypassEvent(scoped_ptr<base::Value> event, |
+ void AddAndSetLastBypassEvent(std::unique_ptr<base::Value> event, |
int64_t expiration_ticks) override; |
// Records whether the Data Reduction Proxy is unreachable or not. |
@@ -127,7 +128,7 @@ class DataReductionProxyService |
const HistoricalDataUsageCallback& load_data_usage_callback); |
void LoadCurrentDataUsageBucket( |
const LoadCurrentDataUsageCallback& load_current_data_usage_callback); |
- void StoreCurrentDataUsageBucket(scoped_ptr<DataUsageBucket> current); |
+ void StoreCurrentDataUsageBucket(std::unique_ptr<DataUsageBucket> current); |
void DeleteHistoricalDataUsage(); |
void DeleteBrowsingHistory(const base::Time& start, const base::Time& end); |
@@ -171,16 +172,16 @@ class DataReductionProxyService |
net::URLRequestContextGetter* url_request_context_getter_; |
// Tracks compression statistics to be displayed to the user. |
- scoped_ptr<DataReductionProxyCompressionStats> compression_stats_; |
+ std::unique_ptr<DataReductionProxyCompressionStats> compression_stats_; |
- scoped_ptr<DataReductionProxyEventStore> event_store_; |
+ std::unique_ptr<DataReductionProxyEventStore> event_store_; |
DataReductionProxySettings* settings_; |
// A prefs service for storing data. |
PrefService* prefs_; |
- scoped_ptr<DBDataOwner> db_data_owner_; |
+ std::unique_ptr<DBDataOwner> db_data_owner_; |
// Used to post tasks to |io_data_|. |
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; |