| Index: ui/app_list/search/history_data.cc
|
| diff --git a/ui/app_list/search/history_data.cc b/ui/app_list/search/history_data.cc
|
| index 0183cc0d5f295d945a93e52ffa77f2f458022ddf..388415cfcd85cea40e6700e01c8f40b9d0216451 100644
|
| --- a/ui/app_list/search/history_data.cc
|
| +++ b/ui/app_list/search/history_data.cc
|
| @@ -97,9 +97,9 @@ void HistoryData::Add(const std::string& query, const std::string& result_id) {
|
| store_->SetSecondary(query, secondary);
|
| }
|
|
|
| -scoped_ptr<KnownResults> HistoryData::GetKnownResults(
|
| +std::unique_ptr<KnownResults> HistoryData::GetKnownResults(
|
| const std::string& query) const {
|
| - scoped_ptr<KnownResults> results(new KnownResults);
|
| + std::unique_ptr<KnownResults> results(new KnownResults);
|
| for (Associations::const_iterator assoc_it = associations_.lower_bound(query);
|
| assoc_it != associations_.end();
|
| ++assoc_it) {
|
| @@ -141,7 +141,7 @@ void HistoryData::RemoveObserver(HistoryDataObserver* observer) {
|
| observers_.RemoveObserver(observer);
|
| }
|
|
|
| -void HistoryData::OnStoreLoaded(scoped_ptr<Associations> loaded_data) {
|
| +void HistoryData::OnStoreLoaded(std::unique_ptr<Associations> loaded_data) {
|
| if (loaded_data)
|
| loaded_data->swap(associations_);
|
|
|
|
|