Basic adaptation to Chromium 49

Converts types, callbacks and headers to match Chromium 49.

Task-number: QTBUG-51173
Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

8 files changed, 13 insertions, 18 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 04b5e2c22..4503520eb 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -91,7 +91,8 @@ public:
     {
         // mark qrc as a secure scheme (avoids deprecation warnings)
         // Can only be done after blink is initialized.
-        blink::WebSecurityPolicy::registerURLSchemeAsSecure(blink::WebString::fromLatin1(kQrcSchemeQt));
+        blink::WebString qrcScheme(base::ASCIIToUTF16(kQrcSchemeQt));
+        blink::WebSecurityPolicy::registerURLSchemeAsSecure(qrcScheme);
     }
 };
 
@@ -160,9 +161,8 @@ bool ContentRendererClientQt::ShouldSuppressErrorPage(content::RenderFrame *fram
 }
 
 // To tap into the chromium localized strings. Ripped from the chrome layer (highly simplified).
-void ContentRendererClientQt::GetNavigationErrorStrings(content::RenderView* renderView, blink::WebFrame *frame, const blink::WebURLRequest &failedRequest, const blink::WebURLError &error, std::string *errorHtml, base::string16 *errorDescription)
+void ContentRendererClientQt::GetNavigationErrorStrings(content::RenderFrame* renderFrame, const blink::WebURLRequest &failedRequest, const blink::WebURLError &error, std::string *errorHtml, base::string16 *errorDescription)
 {
-    Q_UNUSED(frame)
     const bool isPost = QByteArray::fromStdString(failedRequest.httpMethod().utf8()) == QByteArrayLiteral("POST");
 
     if (errorHtml) {
@@ -174,8 +174,8 @@ void ContentRendererClientQt::GetNavigationErrorStrings(content::RenderView* ren
         // TODO(elproxy): We could potentially get better diagnostics here by first calling
         // NetErrorHelper::GetErrorStringsForDnsProbe, but that one is harder to untangle.
         LocalizedError::GetStrings(error.reason, error.domain.utf8(), error.unreachableURL, isPost
-                                   , error.staleCopyInCache && !isPost, false, locale, renderView->GetAcceptLanguages()
-                                   , scoped_ptr<error_page::ErrorPageParams>(), &errorStrings);
+                                  , error.staleCopyInCache && !isPost, false, error_page::OfflinePageStatus::NONE, locale, renderFrame->GetRenderView()->GetAcceptLanguages()
+                                  , scoped_ptr<error_page::ErrorPageParams>(), &errorStrings);
         resourceId = IDR_NET_ERROR_HTML;
 
 
@@ -187,7 +187,7 @@ void ContentRendererClientQt::GetNavigationErrorStrings(content::RenderView* ren
     }
 
     if (errorDescription)
-        *errorDescription = LocalizedError::GetErrorDetails(error, isPost);
+        *errorDescription = LocalizedError::GetErrorDetails(error.domain.utf8(), error.reason, isPost);
 }
 
 unsigned long long ContentRendererClientQt::VisitedLinkHash(const char *canonicalUrl, size_t length)
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index 53be90c97..ba223d878 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -69,7 +69,7 @@ public:
     virtual void RenderFrameCreated(content::RenderFrame* render_frame) Q_DECL_OVERRIDE;
     virtual bool ShouldSuppressErrorPage(content::RenderFrame *, const GURL &) Q_DECL_OVERRIDE;
     virtual bool HasErrorPage(int httpStatusCode, std::string *errorDomain) Q_DECL_OVERRIDE;
-    virtual void GetNavigationErrorStrings(content::RenderView* renderView, blink::WebFrame* frame, const blink::WebURLRequest& failedRequest
+    virtual void GetNavigationErrorStrings(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest
             , const blink::WebURLError& error, std::string* errorHtml, base::string16* errorDescription) Q_DECL_OVERRIDE;
 
     virtual unsigned long long VisitedLinkHash(const char *canonicalUrl, size_t length) Q_DECL_OVERRIDE;
diff --git a/src/core/renderer/pepper/pepper_flash_browser_host_qt.h b/src/core/renderer/pepper/pepper_flash_browser_host_qt.h
index d6c8e69b6..5d1107dfb 100644
--- a/src/core/renderer/pepper/pepper_flash_browser_host_qt.h
+++ b/src/core/renderer/pepper/pepper_flash_browser_host_qt.h
@@ -40,7 +40,6 @@
 #ifndef PEPPER_FLASH_BROWSER_HOST_QT_H
 #define PEPPER_FLASH_BROWSER_HOST_QT_H
 
-#include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "ppapi/host/host_message_context.h"
diff --git a/src/core/renderer/pepper/pepper_flash_renderer_host_qt.h b/src/core/renderer/pepper/pepper_flash_renderer_host_qt.h
index a9de3c6b8..ae6bc0876 100644
--- a/src/core/renderer/pepper/pepper_flash_renderer_host_qt.h
+++ b/src/core/renderer/pepper/pepper_flash_renderer_host_qt.h
@@ -43,7 +43,6 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/host/resource_host.h"
diff --git a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h
index 956fc81dd..bc472a7c6 100644
--- a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h
+++ b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h
@@ -40,8 +40,6 @@
 #ifndef PEPPER_RENDERER_HOST_FACTORY_QT_H
 #define PEPPER_RENDERER_HOST_FACTORY_QT_H
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
 #include "ppapi/host/host_factory.h"
 #include "content/public/renderer/render_frame_observer.h"
 
diff --git a/src/core/renderer/render_frame_observer_qt.h b/src/core/renderer/render_frame_observer_qt.h
index a9246f817..b1d59d8c5 100644
--- a/src/core/renderer/render_frame_observer_qt.h
+++ b/src/core/renderer/render_frame_observer_qt.h
@@ -40,7 +40,6 @@
 #ifndef RENDER_FRAME_OBSERVER_QT_H
 #define RENDER_FRAME_OBSERVER_QT_H
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "content/public/renderer/render_frame_observer.h"
 
diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp
index 0927aa53a..30a04958f 100644
--- a/src/core/renderer/user_resource_controller.cpp
+++ b/src/core/renderer/user_resource_controller.cpp
@@ -85,10 +85,10 @@ void UserResourceController::RenderViewObserverHelper::runScripts(UserScriptData
     content::RenderView *renderView = content::RenderView::FromWebView(frame->view());
     const bool isMainFrame = (frame == renderView->GetWebView()->mainFrame());
 
-    QList<uint64> scriptsToRun = UserResourceController::instance()->m_viewUserScriptMap.value(globalScriptsIndex).toList();
+    QList<uint64_t> scriptsToRun = UserResourceController::instance()->m_viewUserScriptMap.value(globalScriptsIndex).toList();
     scriptsToRun.append(UserResourceController::instance()->m_viewUserScriptMap.value(renderView).toList());
 
-    Q_FOREACH (uint64 id, scriptsToRun) {
+    Q_FOREACH (uint64_t id, scriptsToRun) {
         const UserScriptData &script = UserResourceController::instance()->m_scripts.value(id);
         if (script.injectionPoint != p
                 || (!script.injectForSubframes && !isMainFrame))
@@ -208,7 +208,7 @@ void UserResourceController::renderViewDestroyed(content::RenderView *renderView
     ViewUserScriptMap::iterator it = m_viewUserScriptMap.find(renderView);
     if (it == m_viewUserScriptMap.end()) // ASSERT maybe?
         return;
-    Q_FOREACH (uint64 id, it.value()) {
+    Q_FOREACH (uint64_t id, it.value()) {
         m_scripts.remove(id);
     }
     m_viewUserScriptMap.remove(renderView);
@@ -239,7 +239,7 @@ void UserResourceController::clearScriptsForView(content::RenderView *view)
     ViewUserScriptMap::iterator it = m_viewUserScriptMap.find(view);
     if (it == m_viewUserScriptMap.end())
         return;
-    Q_FOREACH (uint64 id, it.value())
+    Q_FOREACH (uint64_t id, it.value())
         m_scripts.remove(id);
 
     m_viewUserScriptMap.remove(view);
diff --git a/src/core/renderer/user_resource_controller.h b/src/core/renderer/user_resource_controller.h
index b2f7d92c3..bd3d0ba49 100644
--- a/src/core/renderer/user_resource_controller.h
+++ b/src/core/renderer/user_resource_controller.h
@@ -76,10 +76,10 @@ private:
     void onRemoveScript(const UserScriptData &);
     void onClearScripts();
 
-    typedef QSet<uint64> UserScriptSet;
+    typedef QSet<uint64_t> UserScriptSet;
     typedef QHash<const content::RenderView *, UserScriptSet> ViewUserScriptMap;
     ViewUserScriptMap m_viewUserScriptMap;
-    QHash<uint64, UserScriptData> m_scripts;
+    QHash<uint64_t, UserScriptData> m_scripts;
 };
 
 #endif // USER_RESOURCE_CONTROLLER_H