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

Unified Diff: ios/chrome/browser/ios_chrome_io_thread.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
Index: ios/chrome/browser/ios_chrome_io_thread.h
diff --git a/ios/chrome/browser/ios_chrome_io_thread.h b/ios/chrome/browser/ios_chrome_io_thread.h
index 34d4507ed1baf2f5b69bfd3310fcc93df5809a01..7827dcca2bdc39613b80b2ee153ec93dfcec891b 100644
--- a/ios/chrome/browser/ios_chrome_io_thread.h
+++ b/ios/chrome/browser/ios_chrome_io_thread.h
@@ -9,6 +9,7 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <set>
#include <string>
#include <vector>
@@ -16,7 +17,6 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string_piece.h"
#include "base/time/time.h"
@@ -105,31 +105,32 @@ class IOSChromeIOThread : public web::WebThreadDelegate {
// The "system" NetworkDelegate, used for BrowserState-agnostic network
// events.
- scoped_ptr<net::NetworkDelegate> system_network_delegate;
- scoped_ptr<net::HostResolver> host_resolver;
- scoped_ptr<net::CertVerifier> cert_verifier;
+ std::unique_ptr<net::NetworkDelegate> system_network_delegate;
+ std::unique_ptr<net::HostResolver> host_resolver;
+ std::unique_ptr<net::CertVerifier> cert_verifier;
// The ChannelIDService must outlive the HttpTransactionFactory.
- scoped_ptr<net::ChannelIDService> system_channel_id_service;
+ std::unique_ptr<net::ChannelIDService> system_channel_id_service;
// This TransportSecurityState doesn't load or save any state. It's only
// used to enforce pinning for system requests and will only use built-in
// pins.
- scoped_ptr<net::TransportSecurityState> transport_security_state;
- scoped_ptr<net::CTVerifier> cert_transparency_verifier;
- scoped_ptr<net::CTPolicyEnforcer> ct_policy_enforcer;
+ std::unique_ptr<net::TransportSecurityState> transport_security_state;
+ std::unique_ptr<net::CTVerifier> cert_transparency_verifier;
+ std::unique_ptr<net::CTPolicyEnforcer> ct_policy_enforcer;
scoped_refptr<net::SSLConfigService> ssl_config_service;
- scoped_ptr<net::HttpAuthPreferences> http_auth_preferences;
- scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
- scoped_ptr<net::HttpServerProperties> http_server_properties;
- scoped_ptr<net::URLRequestBackoffManager> url_request_backoff_manager;
- scoped_ptr<net::ProxyService> system_proxy_service;
- scoped_ptr<net::HttpNetworkSession> system_http_network_session;
- scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory;
- scoped_ptr<net::URLRequestJobFactory> system_url_request_job_factory;
- scoped_ptr<net::URLRequestContext> system_request_context;
+ std::unique_ptr<net::HttpAuthPreferences> http_auth_preferences;
+ std::unique_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
+ std::unique_ptr<net::HttpServerProperties> http_server_properties;
+ std::unique_ptr<net::URLRequestBackoffManager> url_request_backoff_manager;
+ std::unique_ptr<net::ProxyService> system_proxy_service;
+ std::unique_ptr<net::HttpNetworkSession> system_http_network_session;
+ std::unique_ptr<net::HttpTransactionFactory>
+ system_http_transaction_factory;
+ std::unique_ptr<net::URLRequestJobFactory> system_url_request_job_factory;
+ std::unique_ptr<net::URLRequestContext> system_request_context;
SystemRequestContextLeakChecker system_request_context_leak_checker;
- scoped_ptr<net::CookieStore> system_cookie_store;
- scoped_ptr<net::HttpUserAgentSettings> http_user_agent_settings;
- scoped_ptr<net::NetworkQualityEstimator> network_quality_estimator;
+ std::unique_ptr<net::CookieStore> system_cookie_store;
+ std::unique_ptr<net::HttpUserAgentSettings> http_user_agent_settings;
+ std::unique_ptr<net::NetworkQualityEstimator> network_quality_estimator;
uint16_t testing_fixed_http_port;
uint16_t testing_fixed_https_port;
Optional<bool> enable_tcp_fast_open_for_ssl;
@@ -375,17 +376,18 @@ class IOSChromeIOThread : public web::WebThreadDelegate {
// Observer that logs network changes to the ChromeNetLog.
class LoggingNetworkChangeObserver;
- scoped_ptr<LoggingNetworkChangeObserver> network_change_observer_;
+ std::unique_ptr<LoggingNetworkChangeObserver> network_change_observer_;
// This is an instance of the default SSLConfigServiceManager for the current
// platform and it gets SSL preferences from local_state object.
- scoped_ptr<ssl_config::SSLConfigServiceManager> ssl_config_service_manager_;
+ std::unique_ptr<ssl_config::SSLConfigServiceManager>
+ ssl_config_service_manager_;
// These member variables are initialized by a task posted to the IO thread,
// which gets posted by calling certain member functions of IOSChromeIOThread.
- scoped_ptr<net::ProxyConfigService> system_proxy_config_service_;
+ std::unique_ptr<net::ProxyConfigService> system_proxy_config_service_;
- scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
+ std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
scoped_refptr<net::URLRequestContextGetter>
system_url_request_context_getter_;

Powered by Google App Engine
This is Rietveld 408576698