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

Side by Side Diff: webrtc/base/httpclient.h

Issue 1920043002: Replace scoped_ptr with unique_ptr in webrtc/base/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 7 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
« no previous file with comments | « webrtc/base/httpbase.cc ('k') | webrtc/base/httpclient.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_BASE_HTTPCLIENT_H__ 11 #ifndef WEBRTC_BASE_HTTPCLIENT_H__
12 #define WEBRTC_BASE_HTTPCLIENT_H__ 12 #define WEBRTC_BASE_HTTPCLIENT_H__
13 13
14 #include <memory>
15
14 #include "webrtc/base/common.h" 16 #include "webrtc/base/common.h"
15 #include "webrtc/base/httpbase.h" 17 #include "webrtc/base/httpbase.h"
16 #include "webrtc/base/nethelpers.h" 18 #include "webrtc/base/nethelpers.h"
17 #include "webrtc/base/proxyinfo.h" 19 #include "webrtc/base/proxyinfo.h"
18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/base/sigslot.h" 20 #include "webrtc/base/sigslot.h"
20 #include "webrtc/base/socketaddress.h" 21 #include "webrtc/base/socketaddress.h"
21 #include "webrtc/base/socketpool.h" 22 #include "webrtc/base/socketpool.h"
22 23
23 namespace rtc { 24 namespace rtc {
24 25
25 ////////////////////////////////////////////////////////////////////// 26 //////////////////////////////////////////////////////////////////////
26 // Client-specific http utilities 27 // Client-specific http utilities
27 ////////////////////////////////////////////////////////////////////// 28 //////////////////////////////////////////////////////////////////////
28 29
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 std::string agent_; 166 std::string agent_;
166 StreamPool* pool_; 167 StreamPool* pool_;
167 HttpBase base_; 168 HttpBase base_;
168 SocketAddress server_; 169 SocketAddress server_;
169 ProxyInfo proxy_; 170 ProxyInfo proxy_;
170 HttpTransaction* transaction_; 171 HttpTransaction* transaction_;
171 bool free_transaction_; 172 bool free_transaction_;
172 size_t retries_, attempt_, redirects_; 173 size_t retries_, attempt_, redirects_;
173 RedirectAction redirect_action_; 174 RedirectAction redirect_action_;
174 UriForm uri_form_; 175 UriForm uri_form_;
175 scoped_ptr<HttpAuthContext> context_; 176 std::unique_ptr<HttpAuthContext> context_;
176 DiskCache* cache_; 177 DiskCache* cache_;
177 CacheState cache_state_; 178 CacheState cache_state_;
178 AsyncResolverInterface* resolver_; 179 AsyncResolverInterface* resolver_;
179 }; 180 };
180 181
181 ////////////////////////////////////////////////////////////////////// 182 //////////////////////////////////////////////////////////////////////
182 // HttpClientDefault - Default implementation of HttpClient 183 // HttpClientDefault - Default implementation of HttpClient
183 ////////////////////////////////////////////////////////////////////// 184 //////////////////////////////////////////////////////////////////////
184 185
185 class HttpClientDefault : public ReuseSocketPool, public HttpClient { 186 class HttpClientDefault : public ReuseSocketPool, public HttpClient {
186 public: 187 public:
187 HttpClientDefault(SocketFactory* factory, const std::string& agent, 188 HttpClientDefault(SocketFactory* factory, const std::string& agent,
188 HttpTransaction* transaction = NULL); 189 HttpTransaction* transaction = NULL);
189 }; 190 };
190 191
191 ////////////////////////////////////////////////////////////////////// 192 //////////////////////////////////////////////////////////////////////
192 193
193 } // namespace rtc 194 } // namespace rtc
194 195
195 #endif // WEBRTC_BASE_HTTPCLIENT_H__ 196 #endif // WEBRTC_BASE_HTTPCLIENT_H__
OLDNEW
« no previous file with comments | « webrtc/base/httpbase.cc ('k') | webrtc/base/httpclient.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698