| Index: ui/app_list/test/app_list_test_view_delegate.h
|
| diff --git a/ui/app_list/test/app_list_test_view_delegate.h b/ui/app_list/test/app_list_test_view_delegate.h
|
| index 98395ac031131c07e1f84e701a3fc0b118a07986..626495334fbfd3304d56012e904dffd2febfe4cc 100644
|
| --- a/ui/app_list/test/app_list_test_view_delegate.h
|
| +++ b/ui/app_list/test/app_list_test_view_delegate.h
|
| @@ -8,13 +8,13 @@
|
| #include <stddef.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/callback_forward.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "ui/app_list/app_list_view_delegate.h"
|
| #include "ui/app_list/speech_ui_model.h"
|
| @@ -105,7 +105,7 @@ class AppListTestViewDelegate : public AppListViewDelegate {
|
| int next_profile_app_count_;
|
| std::map<size_t, int> open_search_result_counts_;
|
| Users users_;
|
| - scoped_ptr<AppListTestModel> model_;
|
| + std::unique_ptr<AppListTestModel> model_;
|
| base::ObserverList<AppListViewDelegateObserver> observers_;
|
| SpeechUIModel speech_ui_;
|
| base::TimeDelta auto_launch_timeout_;
|
|
|