| Index: ui/app_list/search/history_data_store.cc
|
| diff --git a/ui/app_list/search/history_data_store.cc b/ui/app_list/search/history_data_store.cc
|
| index 533822037bdce8dec9803dd4ef04cefe6359e982..3da8928958f9fa246870bbb1b7e00bd8ee0b54b4 100644
|
| --- a/ui/app_list/search/history_data_store.cc
|
| +++ b/ui/app_list/search/history_data_store.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ui/app_list/search/history_data_store.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/callback.h"
|
| #include "base/json/json_file_value_serializer.h"
|
| #include "base/json/json_string_value_serializer.h"
|
| @@ -99,7 +101,7 @@ scoped_ptr<HistoryData::Associations> Parse(
|
| base::Time::FromInternalValue(update_time_val);
|
| }
|
|
|
| - return data.Pass();
|
| + return data;
|
| }
|
|
|
| } // namespace
|
| @@ -214,7 +216,7 @@ void HistoryDataStore::OnDictionaryLoadedCallback(
|
| if (!dict) {
|
| callback.Run(nullptr);
|
| } else {
|
| - callback.Run(Parse(dict.Pass()).Pass());
|
| + callback.Run(Parse(std::move(dict)));
|
| }
|
| }
|
|
|
|
|