Index: components/data_reduction_proxy/core/browser/db_data_owner.h |
diff --git a/components/data_reduction_proxy/core/browser/db_data_owner.h b/components/data_reduction_proxy/core/browser/db_data_owner.h |
index 752f8ed3a4c67aa37343de77fe6638f521dd83f2..2160ce54ea5501484252a3d48cc80de9404146b9 100644 |
--- a/components/data_reduction_proxy/core/browser/db_data_owner.h |
+++ b/components/data_reduction_proxy/core/browser/db_data_owner.h |
@@ -5,10 +5,10 @@ |
#ifndef COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DB_SERVICE_H_ |
#define COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DB_SERVICE_H_ |
+#include <memory> |
#include <vector> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/sequence_checker.h" |
@@ -22,18 +22,18 @@ class DataUsageBucket; |
class DataUsageStore; |
// Callback for loading the historical data usage. |
-typedef base::Callback<void(scoped_ptr<std::vector<DataUsageBucket>>)> |
+typedef base::Callback<void(std::unique_ptr<std::vector<DataUsageBucket>>)> |
HistoricalDataUsageCallback; |
// Callback for loading data usage for the current bucket. |
-typedef base::Callback<void(scoped_ptr<DataUsageBucket>)> |
+typedef base::Callback<void(std::unique_ptr<DataUsageBucket>)> |
LoadCurrentDataUsageCallback; |
// Contains and initializes all Data Reduction Proxy objects that have a |
// lifetime based on the DB task runner. |
class DBDataOwner { |
public: |
- explicit DBDataOwner(scoped_ptr<DataStore> store); |
+ explicit DBDataOwner(std::unique_ptr<DataStore> store); |
virtual ~DBDataOwner(); |
// Initializes all the DB objects. Must be called on the DB task runner. |
@@ -46,7 +46,7 @@ class DBDataOwner { |
void LoadCurrentDataUsageBucket(DataUsageBucket* bucket); |
// Stores |current| to |DataStore|. |
- void StoreCurrentDataUsageBucket(scoped_ptr<DataUsageBucket> current); |
+ void StoreCurrentDataUsageBucket(std::unique_ptr<DataUsageBucket> current); |
// Deletes all historical data usage from storage. |
void DeleteHistoricalDataUsage(); |
@@ -58,8 +58,8 @@ class DBDataOwner { |
base::WeakPtr<DBDataOwner> GetWeakPtr(); |
private: |
- scoped_ptr<DataStore> store_; |
- scoped_ptr<DataUsageStore> data_usage_; |
+ std::unique_ptr<DataStore> store_; |
+ std::unique_ptr<DataUsageStore> data_usage_; |
base::SequenceChecker sequence_checker_; |
base::WeakPtrFactory<DBDataOwner> weak_factory_; |