commit 592ff7fef8b3ebee493fc559b9fbb2de9c00608a
author yhirano <yhirano@chromium.org> Mon Dec 07 08:45:19 2015
committer Commit bot <commit-bot@chromium.org> Mon Dec 07 08:46:12 2015
tree f7eae64e616c35e87de9fd002aba534596119c6f
parent 3c8609336d73e51280359eb7461c68906992f757

Use std::vector<scoped_ptr<T>> instead of scoped_vector<T> in net/websockets.

BUG=554289

Review URL: https://codereview.chromium.org/1483913002

Cr-Commit-Position: refs/heads/master@{#363424}

net/websockets/websocket_stream_create_test_base.h

diff --git a/net/websockets/websocket_stream_create_test_base.h b/net/websockets/websocket_stream_create_test_base.h
index 70451ef..8fbb48d 100644
--- a/net/websockets/websocket_stream_create_test_base.h
+++ b/net/websockets/websocket_stream_create_test_base.h
@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "base/timer/timer.h"
 #include "net/base/net_export.h"
@@ -70,7 +69,7 @@
   scoped_ptr<WebSocketEventInterface::SSLErrorCallbacks> ssl_error_callbacks_;
   SSLInfo ssl_info_;
   bool ssl_fatal_;
-  ScopedVector<SSLSocketDataProvider> ssl_data_;
+  std::vector<scoped_ptr<SSLSocketDataProvider>> ssl_data_;
 
   // This temporarily sets WebSocketEndpointLockManager unlock delay to zero
   // during tests.