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/http/http_transaction_test_util.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/http/http_transaction_test_util.h')
| -rw-r--r-- | chromium/net/http/http_transaction_test_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/net/http/http_transaction_test_util.h b/chromium/net/http/http_transaction_test_util.h index 3a9532ed432..4d78f4d4cb2 100644 --- a/chromium/net/http/http_transaction_test_util.h +++ b/chromium/net/http/http_transaction_test_util.h @@ -152,7 +152,7 @@ class TestTransactionConsumer { void OnIOComplete(int result); State state_; - scoped_ptr<HttpTransaction> trans_; + std::unique_ptr<HttpTransaction> trans_; std::string content_; scoped_refptr<IOBuffer> read_buf_; int error_; @@ -312,7 +312,7 @@ class MockNetworkLayer : public HttpTransactionFactory, // HttpTransactionFactory: int CreateTransaction(RequestPriority priority, - scoped_ptr<HttpTransaction>* trans) override; + std::unique_ptr<HttpTransaction>* trans) override; HttpCache* GetCache() override; HttpNetworkSession* GetSession() override; |