Index: chrome/browser/ui/app_list/search/common/webservice_cache.h |
diff --git a/chrome/browser/ui/app_list/search/common/webservice_cache.h b/chrome/browser/ui/app_list/search/common/webservice_cache.h |
index a5ac9104afc88c25de10e95fe37bc9fa3b96f294..d9f67ca541016b4497682e7f917977ae421904ca 100644 |
--- a/chrome/browser/ui/app_list/search/common/webservice_cache.h |
+++ b/chrome/browser/ui/app_list/search/common/webservice_cache.h |
@@ -5,12 +5,12 @@ |
#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_COMMON_WEBSERVICE_CACHE_H_ |
#define CHROME_BROWSER_UI_APP_LIST_SEARCH_COMMON_WEBSERVICE_CACHE_H_ |
+#include <memory> |
#include <utility> |
#include "base/containers/mru_cache.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/time/time.h" |
#include "components/keyed_service/core/keyed_service.h" |
#include "ui/app_list/search/dictionary_data_store.h" |
@@ -60,24 +60,25 @@ class WebserviceCache : public KeyedService, |
// Puts the new result to the query. |
void Put(QueryType type, |
const std::string& query, |
- scoped_ptr<base::DictionaryValue> result); |
+ std::unique_ptr<base::DictionaryValue> result); |
private: |
struct Payload { |
- Payload(const base::Time& time, scoped_ptr<base::DictionaryValue> result); |
+ Payload(const base::Time& time, |
+ std::unique_ptr<base::DictionaryValue> result); |
Payload(); |
~Payload(); |
Payload& operator=(Payload&& other); |
base::Time time; |
- scoped_ptr<base::DictionaryValue> result; |
+ std::unique_ptr<base::DictionaryValue> result; |
}; |
- using Cache = base::MRUCache<std::string, scoped_ptr<Payload>>; |
+ using Cache = base::MRUCache<std::string, std::unique_ptr<Payload>>; |
// Callback for when the cache is loaded from the dictionary data store. |
- void OnCacheLoaded(scoped_ptr<base::DictionaryValue>); |
+ void OnCacheLoaded(std::unique_ptr<base::DictionaryValue>); |
// Populates the payload parameter with the corresponding payload stored |
// in the given dictionary. If the dictionary is invalid for any reason, |