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, 4 insertions, 8 deletions

diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index f5f490ccf..8da5e2611 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -244,8 +244,9 @@ public:
     int PreCreateThreads() Q_DECL_OVERRIDE
     {
         base::ThreadRestrictions::SetIOAllowed(true);
-        // Like ChromeBrowserMainExtraPartsAura::PreCreateThreads does.
-        gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, new DesktopScreenQt);
+        // Like ChromeBrowserMainExtraPartsViews::PreCreateThreads does.
+        gfx::Screen::SetScreenInstance(new DesktopScreenQt);
+
         return 0;
     }
 
@@ -351,7 +352,7 @@ ContentBrowserClientQt *ContentBrowserClientQt::Get()
 
 content::BrowserMainParts *ContentBrowserClientQt::CreateBrowserMainParts(const content::MainFunctionParams&)
 {
-    m_browserMainParts = new BrowserMainPartsQt;
+    m_browserMainParts = new BrowserMainPartsQt();
     return m_browserMainParts;
 }
 
@@ -401,11 +402,6 @@ content::AccessTokenStore *ContentBrowserClientQt::CreateAccessTokenStore()
     return new AccessTokenStoreQt;
 }
 
-net::URLRequestContextGetter* ContentBrowserClientQt::CreateRequestContext(content::BrowserContext* browser_context, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptors)
-{
-    return static_cast<BrowserContextQt*>(browser_context)->CreateRequestContext(protocol_handlers, std::move(request_interceptors));
-}
-
 content::QuotaPermissionContext *ContentBrowserClientQt::CreateQuotaPermissionContext()
 {
     return new QuotaPermissionContextQt;