Basic porting to Chromium 51

Trivial changes in methods, arguments and types.

Change-Id: Ic707c376249f816268223e696ed5f6251df1f85f
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/core/url_request_context_getter_qt.h b/src/core/url_request_context_getter_qt.h
index eca956ea6..b4bd3fdfe 100644
--- a/src/core/url_request_context_getter_qt.h
+++ b/src/core/url_request_context_getter_qt.h
@@ -46,6 +46,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/url_constants.h"
 #include "net/http/http_network_session.h"
@@ -116,12 +117,12 @@ private:
     content::ProtocolHandlerMap m_protocolHandlers;
 
     QAtomicPointer<net::ProxyConfigService> m_proxyConfigService;
-    scoped_ptr<net::URLRequestContext> m_urlRequestContext;
-    scoped_ptr<NetworkDelegateQt> m_networkDelegate;
-    scoped_ptr<net::URLRequestContextStorage> m_storage;
-    scoped_ptr<net::URLRequestJobFactory> m_jobFactory;
+    std::unique_ptr<net::URLRequestContext> m_urlRequestContext;
+    std::unique_ptr<NetworkDelegateQt> m_networkDelegate;
+    std::unique_ptr<net::URLRequestContextStorage> m_storage;
+    std::unique_ptr<net::URLRequestJobFactory> m_jobFactory;
     net::URLRequestJobFactoryImpl *m_baseJobFactory;
-    scoped_ptr<net::DhcpProxyScriptFetcherFactory> m_dhcpProxyScriptFetcherFactory;
+    std::unique_ptr<net::DhcpProxyScriptFetcherFactory> m_dhcpProxyScriptFetcherFactory;
     scoped_refptr<CookieMonsterDelegateQt> m_cookieDelegate;
     content::URLRequestInterceptorScopedVector m_requestInterceptors;
     scoped_ptr<net::HttpNetworkSession> m_httpNetworkSession;