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/tools/quic/test_tools/server_thread.h | |
| 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/tools/quic/test_tools/server_thread.h')
| -rw-r--r-- | chromium/net/tools/quic/test_tools/server_thread.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/net/tools/quic/test_tools/server_thread.h b/chromium/net/tools/quic/test_tools/server_thread.h index 244a87c55e5..b907fd16010 100644 --- a/chromium/net/tools/quic/test_tools/server_thread.h +++ b/chromium/net/tools/quic/test_tools/server_thread.h @@ -5,6 +5,8 @@ #ifndef NET_TOOLS_QUIC_TEST_TOOLS_SERVER_THREAD_H_ #define NET_TOOLS_QUIC_TEST_TOOLS_SERVER_THREAD_H_ +#include <memory> + #include "base/macros.h" #include "base/threading/simple_thread.h" #include "net/base/ip_endpoint.h" @@ -63,7 +65,7 @@ class ServerThread : public base::SimpleThread { base::WaitableEvent resume_; // Notified when the server should resume. base::WaitableEvent quit_; // Notified when the server should quit. - scoped_ptr<QuicServer> server_; + std::unique_ptr<QuicServer> server_; IPEndPoint address_; base::Lock port_lock_; int port_; |