diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/websockets/websocket_stream_cookie_test.cc | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/websockets/websocket_stream_cookie_test.cc')
| -rw-r--r-- | chromium/net/websockets/websocket_stream_cookie_test.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/net/websockets/websocket_stream_cookie_test.cc b/chromium/net/websockets/websocket_stream_cookie_test.cc index c45fac4956d..9ff71e001d9 100644 --- a/chromium/net/websockets/websocket_stream_cookie_test.cc +++ b/chromium/net/websockets/websocket_stream_cookie_test.cc @@ -5,12 +5,13 @@ #include <string> #include "base/callback_forward.h" +#include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "net/cookies/cookie_store.h" #include "net/socket/socket_test_util.h" #include "net/websockets/websocket_stream_create_test_base.h" @@ -118,7 +119,7 @@ class WebSocketStreamServerSetCookieTest TEST_P(WebSocketStreamClientUseCookieTest, ClientUseCookie) { // For wss tests. - ssl_data_.push_back(make_scoped_ptr(new SSLSocketDataProvider(ASYNC, OK))); + ssl_data_.push_back(base::WrapUnique(new SSLSocketDataProvider(ASYNC, OK))); CookieStore* store = url_request_context_host_.GetURLRequestContext()->cookie_store(); @@ -151,7 +152,7 @@ TEST_P(WebSocketStreamClientUseCookieTest, ClientUseCookie) { TEST_P(WebSocketStreamServerSetCookieTest, ServerSetCookie) { // For wss tests. - ssl_data_.push_back(make_scoped_ptr(new SSLSocketDataProvider(ASYNC, OK))); + ssl_data_.push_back(base::WrapUnique(new SSLSocketDataProvider(ASYNC, OK))); const GURL url(GetParam().url); const GURL cookie_url(GetParam().cookie_url); |