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/extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.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/extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.cc')
| -rw-r--r-- | chromium/extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.cc b/chromium/extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.cc index ce68bdb589f..d15d1c038c0 100644 --- a/chromium/extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.cc +++ b/chromium/extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.cc @@ -43,7 +43,7 @@ void TestMimeHandlerViewGuest::CreateWebContents( if (delay_) { auto delta = base::TimeDelta::FromMilliseconds( delay_); - scoped_ptr<base::DictionaryValue> params(create_params.DeepCopy()); + std::unique_ptr<base::DictionaryValue> params(create_params.DeepCopy()); content::BrowserThread::PostDelayedTask( content::BrowserThread::UI, FROM_HERE, @@ -68,7 +68,7 @@ void TestMimeHandlerViewGuest::DidAttachToEmbedder() { } void TestMimeHandlerViewGuest::CallBaseCreateWebContents( - scoped_ptr<base::DictionaryValue> create_params, + std::unique_ptr<base::DictionaryValue> create_params, const WebContentsCreatedCallback& callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); MimeHandlerViewGuest::CreateWebContents(*create_params.get(), callback); |