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

Side by Side Diff: ios/crnet/crnet_environment.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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef IOS_CRNET_CRNET_ENVIRONMENT_H_ 5 #ifndef IOS_CRNET_CRNET_ENVIRONMENT_H_
6 #define IOS_CRNET_CRNET_ENVIRONMENT_H_ 6 #define IOS_CRNET_CRNET_ENVIRONMENT_H_
7 7
8 #include <memory>
9
8 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
11 #include "base/synchronization/waitable_event.h" 13 #include "base/synchronization/waitable_event.h"
12 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
13 #import "ios/crnet/CrNet.h" 15 #import "ios/crnet/CrNet.h"
14 #include "net/url_request/url_request.h" 16 #include "net/url_request/url_request.h"
15 #include "net/url_request/url_request_context.h" 17 #include "net/url_request/url_request_context.h"
16 18
17 class JsonPrefStore; 19 class JsonPrefStore;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 // Helper method that closes all current SPDY sessions on the network IO 133 // Helper method that closes all current SPDY sessions on the network IO
132 // thread. 134 // thread.
133 void CloseAllSpdySessionsInternal(); 135 void CloseAllSpdySessionsInternal();
134 136
135 bool spdy_enabled_; 137 bool spdy_enabled_;
136 bool quic_enabled_; 138 bool quic_enabled_;
137 bool sdch_enabled_; 139 bool sdch_enabled_;
138 std::string sdch_pref_store_filename_; 140 std::string sdch_pref_store_filename_;
139 141
140 static CrNetEnvironment* chrome_net_; 142 static CrNetEnvironment* chrome_net_;
141 scoped_ptr<base::Thread> network_io_thread_; 143 std::unique_ptr<base::Thread> network_io_thread_;
142 scoped_ptr<base::Thread> network_cache_thread_; 144 std::unique_ptr<base::Thread> network_cache_thread_;
143 scoped_ptr<base::Thread> file_thread_; 145 std::unique_ptr<base::Thread> file_thread_;
144 scoped_ptr<base::Thread> file_user_blocking_thread_; 146 std::unique_ptr<base::Thread> file_user_blocking_thread_;
145 scoped_ptr<net::SdchManager> sdch_manager_; 147 std::unique_ptr<net::SdchManager> sdch_manager_;
146 scoped_ptr<net::SdchOwner> sdch_owner_; 148 std::unique_ptr<net::SdchOwner> sdch_owner_;
147 scoped_refptr<base::SequencedTaskRunner> pref_store_worker_pool_; 149 scoped_refptr<base::SequencedTaskRunner> pref_store_worker_pool_;
148 scoped_refptr<JsonPrefStore> net_pref_store_; 150 scoped_refptr<JsonPrefStore> net_pref_store_;
149 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; 151 std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier_;
150 scoped_ptr<net::ProxyConfigService> proxy_config_service_; 152 std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
151 scoped_ptr<net::HttpServerProperties> http_server_properties_; 153 std::unique_ptr<net::HttpServerProperties> http_server_properties_;
152 scoped_ptr<net::CookieStore> cookie_store_; 154 std::unique_ptr<net::CookieStore> cookie_store_;
153 scoped_refptr<net::URLRequestContextGetter> main_context_getter_; 155 scoped_refptr<net::URLRequestContextGetter> main_context_getter_;
154 scoped_ptr<net::URLRequestContext> main_context_; 156 std::unique_ptr<net::URLRequestContext> main_context_;
155 scoped_ptr<CrNetHttpProtocolHandlerDelegate> http_protocol_handler_delegate_; 157 std::unique_ptr<CrNetHttpProtocolHandlerDelegate>
158 http_protocol_handler_delegate_;
156 std::string user_agent_product_name_; 159 std::string user_agent_product_name_;
157 scoped_ptr<net::NetLog> net_log_; 160 std::unique_ptr<net::NetLog> net_log_;
158 scoped_ptr<net::WriteToFileNetLogObserver> net_log_observer_; 161 std::unique_ptr<net::WriteToFileNetLogObserver> net_log_observer_;
159 162
160 DISALLOW_COPY_AND_ASSIGN(CrNetEnvironment); 163 DISALLOW_COPY_AND_ASSIGN(CrNetEnvironment);
161 }; 164 };
162 165
163 #endif // IOS_CRNET_CRNET_ENVIRONMENT_H_ 166 #endif // IOS_CRNET_CRNET_ENVIRONMENT_H_
OLDNEW
« no previous file with comments | « ios/chrome/tools/strings/generate_localizable_strings.mm ('k') | ios/crnet/crnet_environment.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698