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

Unified Diff: ios/web/app/web_main_loop.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: Add header 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
Index: ios/web/app/web_main_loop.h
diff --git a/ios/web/app/web_main_loop.h b/ios/web/app/web_main_loop.h
index 9797cfcb4116aec89adb8d15b5fcf583fe8073e7..67f0fb50734e8330a7f121b872c71a31c003875a 100644
--- a/ios/web/app/web_main_loop.h
+++ b/ios/web/app/web_main_loop.h
@@ -5,9 +5,10 @@
#ifndef IOS_WEB_APP_WEB_MAIN_LOOP_H_
#define IOS_WEB_APP_WEB_MAIN_LOOP_H_
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
namespace base {
class CommandLine;
@@ -68,28 +69,28 @@ class WebMainLoop {
bool created_threads_;
// Members initialized in |MainMessageLoopStart()| ---------------------------
- scoped_ptr<base::MessageLoop> main_message_loop_;
- scoped_ptr<base::SystemMonitor> system_monitor_;
- scoped_ptr<base::PowerMonitor> power_monitor_;
- scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
+ std::unique_ptr<base::MessageLoop> main_message_loop_;
+ std::unique_ptr<base::SystemMonitor> system_monitor_;
+ std::unique_ptr<base::PowerMonitor> power_monitor_;
+ std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier_;
// Destroy parts_ before main_message_loop_ (required) and before other
// classes constructed in web (but after main_thread_).
- scoped_ptr<WebMainParts> parts_;
+ std::unique_ptr<WebMainParts> parts_;
// Members initialized in |InitializeMainThread()| ---------------------------
// This must get destroyed before other threads that are created in parts_.
- scoped_ptr<WebThreadImpl> main_thread_;
+ std::unique_ptr<WebThreadImpl> main_thread_;
// Members initialized in |RunMainMessageLoopParts()| ------------------------
- scoped_ptr<WebThreadImpl> db_thread_;
- scoped_ptr<WebThreadImpl> file_user_blocking_thread_;
- scoped_ptr<WebThreadImpl> file_thread_;
- scoped_ptr<WebThreadImpl> cache_thread_;
- scoped_ptr<WebThreadImpl> io_thread_;
+ std::unique_ptr<WebThreadImpl> db_thread_;
+ std::unique_ptr<WebThreadImpl> file_user_blocking_thread_;
+ std::unique_ptr<WebThreadImpl> file_thread_;
+ std::unique_ptr<WebThreadImpl> cache_thread_;
+ std::unique_ptr<WebThreadImpl> io_thread_;
// Members initialized in |WebThreadsStarted()| --------------------------
- scoped_ptr<CookieNotificationBridge> cookie_notification_bridge_;
+ std::unique_ptr<CookieNotificationBridge> cookie_notification_bridge_;
DISALLOW_COPY_AND_ASSIGN(WebMainLoop);
};

Powered by Google App Engine
This is Rietveld 408576698