Adaptations to Chromium 52

Change-Id: Idf8a511ba26d263fd9d014d87d5e1101d706da71
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 6 insertions, 10 deletions

diff --git a/src/core/browser_context_qt.cpp b/src/core/browser_context_qt.cpp
index 42993207d..bc5341f46 100644
--- a/src/core/browser_context_qt.cpp
+++ b/src/core/browser_context_qt.cpp
@@ -117,19 +117,15 @@ net::URLRequestContextGetter *BrowserContextQt::GetRequestContext()
     return url_request_getter_.get();
 }
 
-net::URLRequestContextGetter *BrowserContextQt::GetMediaRequestContext()
+net::URLRequestContextGetter *BrowserContextQt::CreateMediaRequestContext()
 {
-    return GetRequestContext();
-}
-
-net::URLRequestContextGetter *BrowserContextQt::GetMediaRequestContextForRenderProcess(int)
-{
-    return GetRequestContext();
+    return url_request_getter_.get();
 }
 
-net::URLRequestContextGetter *BrowserContextQt::GetMediaRequestContextForStoragePartition(const base::FilePath&, bool)
+net::URLRequestContextGetter *BrowserContextQt::CreateMediaRequestContextForStoragePartition(const base::FilePath&, bool)
 {
-    return GetRequestContext();
+    Q_UNIMPLEMENTED();
+    return nullptr;
 }
 
 content::ResourceContext *BrowserContextQt::GetResourceContext()
@@ -167,7 +163,7 @@ content::SSLHostStateDelegate* BrowserContextQt::GetSSLHostStateDelegate()
     return sslHostStateDelegate.get();
 }
 
-scoped_ptr<content::ZoomLevelDelegate> BrowserContextQt::CreateZoomLevelDelegate(const base::FilePath&)
+std::unique_ptr<content::ZoomLevelDelegate> BrowserContextQt::CreateZoomLevelDelegate(const base::FilePath&)
 {
     return nullptr;
 }