Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(680)

Unified Diff: ui/app_list/test/app_list_test_view_delegate.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/test/app_list_test_model.cc ('k') | ui/app_list/test/test_search_result.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « ui/app_list/test/app_list_test_model.cc ('k') | ui/app_list/test/test_search_result.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698