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

Unified Diff: ios/web/public/test/test_web_thread_bundle.h

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? 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 | « ios/web/public/test/test_web_thread.h ('k') | ios/web/public/web_controller_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/public/test/test_web_thread_bundle.h
diff --git a/ios/web/public/test/test_web_thread_bundle.h b/ios/web/public/test/test_web_thread_bundle.h
index 1f586d52d5741c69985b6c25be2bc238c0a26ed7..47f76b80cc1777c6e81f15d41e681124ec3d28bb 100644
--- a/ios/web/public/test/test_web_thread_bundle.h
+++ b/ios/web/public/test/test_web_thread_bundle.h
@@ -30,8 +30,9 @@
// IO_MAINLOOP will use a MessageLoopForIO for the main MessageLoop.
// Most of the time, this avoids needing to use a REAL_IO_THREAD.
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
namespace base {
class MessageLoop;
@@ -64,13 +65,13 @@ class TestWebThreadBundle {
private:
void Init(int options);
- scoped_ptr<base::MessageLoop> message_loop_;
- scoped_ptr<TestWebThread> ui_thread_;
- scoped_ptr<TestWebThread> db_thread_;
- scoped_ptr<TestWebThread> file_thread_;
- scoped_ptr<TestWebThread> file_user_blocking_thread_;
- scoped_ptr<TestWebThread> cache_thread_;
- scoped_ptr<TestWebThread> io_thread_;
+ std::unique_ptr<base::MessageLoop> message_loop_;
+ std::unique_ptr<TestWebThread> ui_thread_;
+ std::unique_ptr<TestWebThread> db_thread_;
+ std::unique_ptr<TestWebThread> file_thread_;
+ std::unique_ptr<TestWebThread> file_user_blocking_thread_;
+ std::unique_ptr<TestWebThread> cache_thread_;
+ std::unique_ptr<TestWebThread> io_thread_;
DISALLOW_COPY_AND_ASSIGN(TestWebThreadBundle);
};
« no previous file with comments | « ios/web/public/test/test_web_thread.h ('k') | ios/web/public/web_controller_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698