| Index: chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.h
|
| diff --git a/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.h b/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.h
|
| index 3eb4993c96e06807c70b703098233902890aa50a..2a86cf5763261881000e2f43ed4f98768ae39a81 100644
|
| --- a/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.h
|
| +++ b/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_SUGGESTIONS_URL_SUGGESTION_RESULT_H_
|
| #define CHROME_BROWSER_UI_APP_LIST_SEARCH_SUGGESTIONS_URL_SUGGESTION_RESULT_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/task/cancelable_task_tracker.h"
|
| #include "components/suggestions/proto/suggestions.pb.h"
|
| #include "ui/app_list/search_result.h"
|
| @@ -43,7 +44,7 @@ class URLSuggestionResult : public SearchResult {
|
|
|
| // SearchResult overrides:
|
| void Open(int event_flags) override;
|
| - scoped_ptr<SearchResult> Duplicate() const override;
|
| + std::unique_ptr<SearchResult> Duplicate() const override;
|
|
|
| // Refer to SearchResult::set_relevance for documentation.
|
| using SearchResult::set_relevance;
|
| @@ -59,7 +60,7 @@ class URLSuggestionResult : public SearchResult {
|
| favicon::FaviconService* favicon_service_;
|
| suggestions::SuggestionsService* suggestions_service_;
|
| suggestions::ChromeSuggestion suggestion_;
|
| - scoped_ptr<base::CancelableTaskTracker> cancelable_task_tracker_;
|
| + std::unique_ptr<base::CancelableTaskTracker> cancelable_task_tracker_;
|
|
|
| // For callbacks that may be run after destruction.
|
| base::WeakPtrFactory<URLSuggestionResult> weak_ptr_factory_;
|
|
|