| Index: content/shell/browser/layout_test/layout_test_url_request_context_getter.cc
|
| diff --git a/content/shell/browser/layout_test/layout_test_url_request_context_getter.cc b/content/shell/browser/layout_test/layout_test_url_request_context_getter.cc
|
| index 44925becf2ff338f582f9f45f6d34cff89e6eb9c..aba87032d7def841285aeacb1eaccaa6dfaa17f0 100644
|
| --- a/content/shell/browser/layout_test/layout_test_url_request_context_getter.cc
|
| +++ b/content/shell/browser/layout_test/layout_test_url_request_context_getter.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/command_line.h"
|
| #include "base/logging.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/shell/browser/shell_network_delegate.h"
|
| #include "net/proxy/proxy_service.h"
|
| @@ -36,18 +37,18 @@ LayoutTestURLRequestContextGetter::LayoutTestURLRequestContextGetter(
|
| LayoutTestURLRequestContextGetter::~LayoutTestURLRequestContextGetter() {
|
| }
|
|
|
| -scoped_ptr<net::NetworkDelegate>
|
| +std::unique_ptr<net::NetworkDelegate>
|
| LayoutTestURLRequestContextGetter::CreateNetworkDelegate() {
|
| ShellNetworkDelegate::SetAcceptAllCookies(false);
|
| - return make_scoped_ptr(new ShellNetworkDelegate);
|
| + return base::WrapUnique(new ShellNetworkDelegate);
|
| }
|
|
|
| -scoped_ptr<net::ProxyConfigService>
|
| +std::unique_ptr<net::ProxyConfigService>
|
| LayoutTestURLRequestContextGetter::GetProxyConfigService() {
|
| return nullptr;
|
| }
|
|
|
| -scoped_ptr<net::ProxyService>
|
| +std::unique_ptr<net::ProxyService>
|
| LayoutTestURLRequestContextGetter::GetProxyService() {
|
| return net::ProxyService::CreateDirect();
|
| }
|
|
|