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

Unified Diff: net/url_request/url_request_context_builder.h

Issue 1504383002: Remove ScopedVector from url_request_context_builder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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: net/url_request/url_request_context_builder.h
diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h
index 81962e1ae2d1ce72a9538864b3b2f99e7ecea0b9..54e8064b23a5bc1caf32c16f6a92eaea06924f20 100644
--- a/net/url_request/url_request_context_builder.h
+++ b/net/url_request/url_request_context_builder.h
@@ -21,7 +21,6 @@
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
#include "build/build_config.h"
#include "net/base/net_export.h"
#include "net/base/network_delegate.h"
@@ -228,7 +227,7 @@ class NET_EXPORT URLRequestContextBuilder {
void SetCertVerifier(scoped_ptr<CertVerifier> cert_verifier);
void SetInterceptors(
- ScopedVector<URLRequestInterceptor> url_request_interceptors);
+ std::vector<scoped_ptr<URLRequestInterceptor>> url_request_interceptors);
// Override the default in-memory cookie store and channel id service.
// |cookie_store| must not be NULL. |channel_id_service| may be NULL to
@@ -300,7 +299,7 @@ class NET_EXPORT URLRequestContextBuilder {
scoped_ptr<FtpTransactionFactory> ftp_transaction_factory_;
std::vector<SchemeFactory> extra_http_auth_handlers_;
scoped_ptr<CertVerifier> cert_verifier_;
- ScopedVector<URLRequestInterceptor> url_request_interceptors_;
+ std::vector<scoped_ptr<URLRequestInterceptor>> url_request_interceptors_;
scoped_ptr<HttpServerProperties> http_server_properties_;
DISALLOW_COPY_AND_ASSIGN(URLRequestContextBuilder);

Powered by Google App Engine
This is Rietveld 408576698