Basic porting to Chromium 51

Trivial changes in methods, arguments and types.

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

6 files changed, 42 insertions, 36 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 5d1780cbe..3e0646d10 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -43,13 +43,13 @@
 
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/common/localized_error.h"
 #if defined(ENABLE_SPELLCHECK)
 #include "chrome/renderer/spellchecker/spellcheck.h"
 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
 #endif
 #include "components/cdm/renderer/widevine_key_systems.h"
 #include "components/error_page/common/error_page_params.h"
+#include "components/error_page/common/localized_error.h"
 #if defined (ENABLE_BASIC_PRINTING)
 #include "components/printing/renderer/print_web_view_helper.h"
 #endif // if defined(ENABLE_BASIC_PRINTING)
@@ -76,7 +76,7 @@
 #include "renderer/render_view_observer_qt.h"
 #include "renderer/user_resource_controller.h"
 
-#include "grit/renderer_resources.h"
+#include "components/grit/components_resources.h"
 
 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
 
@@ -111,7 +111,6 @@ void ContentRendererClientQt::RenderThreadStarted()
     m_webCacheObserver.reset(new web_cache::WebCacheRenderProcessObserver());
     m_renderProcessObserver.reset(new RenderProcessObserverQt());
     renderThread->AddObserver(m_visitedLinkSlave.data());
-    renderThread->AddObserver(m_webCacheObserver.data());
     renderThread->AddObserver(UserResourceController::instance());
     renderThread->AddObserver(m_renderProcessObserver.data());
 
@@ -147,11 +146,11 @@ void ContentRendererClientQt::RenderFrameCreated(content::RenderFrame* render_fr
 bool ContentRendererClientQt::HasErrorPage(int httpStatusCode, std::string *errorDomain)
 {
     // Use an internal error page, if we have one for the status code.
-    if (!LocalizedError::HasStrings(LocalizedError::kHttpErrorDomain, httpStatusCode)) {
+    if (!error_page::LocalizedError::HasStrings(error_page::LocalizedError::kHttpErrorDomain, httpStatusCode)) {
         return false;
     }
 
-    *errorDomain = LocalizedError::kHttpErrorDomain;
+    *errorDomain = error_page::LocalizedError::kHttpErrorDomain;
     return true;
 }
 
@@ -173,8 +172,9 @@ void ContentRendererClientQt::GetNavigationErrorStrings(content::RenderFrame* re
         const std::string locale = content::RenderThread::Get()->GetLocale();
         // 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, error_page::OfflinePageStatus::NONE, locale, renderFrame->GetRenderView()->GetAcceptLanguages()
+
+        error_page::LocalizedError::GetStrings(error.reason, error.domain.utf8(), error.unreachableURL, isPost
+                                  , error.staleCopyInCache && !isPost, false, false, locale
                                   , scoped_ptr<error_page::ErrorPageParams>(), &errorStrings);
         resourceId = IDR_NET_ERROR_HTML;
 
@@ -187,7 +187,7 @@ void ContentRendererClientQt::GetNavigationErrorStrings(content::RenderFrame* re
     }
 
     if (errorDescription)
-        *errorDescription = LocalizedError::GetErrorDetails(error.domain.utf8(), error.reason, isPost);
+        *errorDescription = error_page::LocalizedError::GetErrorDetails(error.domain.utf8(), error.reason, isPost);
 }
 
 unsigned long long ContentRendererClientQt::VisitedLinkHash(const char *canonicalUrl, size_t length)
@@ -320,7 +320,7 @@ static void AddPepperBasedWidevine(std::vector<media::KeySystemInfo>* concrete_k
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
     cdm::AddWidevineWithCodecs(
-        cdm::WIDEVINE, supported_codecs,
+        supported_codecs,
         media::EmeRobustness::SW_SECURE_CRYPTO,       // Maximum audio robustness.
         media::EmeRobustness::SW_SECURE_DECODE,       // Maximum video robustness.
         media::EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-license.
diff --git a/src/core/renderer/pepper/pepper_host_factory_qt.cpp b/src/core/renderer/pepper/pepper_host_factory_qt.cpp
index 9fbd413ef..a0bab1e51 100644
--- a/src/core/renderer/pepper/pepper_host_factory_qt.cpp
+++ b/src/core/renderer/pepper/pepper_host_factory_qt.cpp
@@ -44,6 +44,7 @@
 
 #include "pepper_host_factory_qt.h"
 
+#include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "ppapi/host/message_filter_host.h"
@@ -68,7 +69,7 @@ PepperHostFactoryQt::PepperHostFactoryQt(content::BrowserPpapiHost* host)
 
 PepperHostFactoryQt::~PepperHostFactoryQt() {}
 
-scoped_ptr<ppapi::host::ResourceHost> PepperHostFactoryQt::CreateResourceHost(ppapi::host::PpapiHost* host,
+std::unique_ptr<ppapi::host::ResourceHost> PepperHostFactoryQt::CreateResourceHost(ppapi::host::PpapiHost* host,
         PP_Resource resource,
         PP_Instance instance,
         const IPC::Message& message)
@@ -77,14 +78,12 @@ scoped_ptr<ppapi::host::ResourceHost> PepperHostFactoryQt::CreateResourceHost(pp
 
 
     if (!host_->IsValidInstance(instance))
-        return scoped_ptr<ppapi::host::ResourceHost>();
+        return nullptr;
 
     if (host_->GetPpapiHost()->permissions().HasPermission(ppapi::PERMISSION_FLASH)
             && message.type() == PpapiHostMsg_Flash_Create::ID)
-        return scoped_ptr<ppapi::host::ResourceHost>(
-                    new PepperFlashBrowserHostQt(host_,
-                                                 instance,
-                                                 resource));
+        return base::WrapUnique(
+            new PepperFlashBrowserHostQt(host_, instance, resource));
 
     // Permissions for the following interfaces will be checked at the
     // time of the corresponding instance's methods calls (because
@@ -95,11 +94,12 @@ scoped_ptr<ppapi::host::ResourceHost> PepperHostFactoryQt::CreateResourceHost(pp
     if (message.type() == PpapiHostMsg_IsolatedFileSystem_Create::ID) {
         PepperIsolatedFileSystemMessageFilter* isolated_fs_filter = PepperIsolatedFileSystemMessageFilter::Create(instance, host_);
         if (!isolated_fs_filter)
-            return scoped_ptr<ResourceHost>();
-        return scoped_ptr<ResourceHost>(new MessageFilterHost(host, instance, resource, isolated_fs_filter));
+            return nullptr;
+        return base::WrapUnique(
+            new MessageFilterHost(host_->GetPpapiHost(), instance, resource, isolated_fs_filter));
     }
 
-    return scoped_ptr<ppapi::host::ResourceHost>();
+    return nullptr;
 }
 
 }  // namespace QtWebEngineCore
diff --git a/src/core/renderer/pepper/pepper_host_factory_qt.h b/src/core/renderer/pepper/pepper_host_factory_qt.h
index e73e097c0..0446cf9e3 100644
--- a/src/core/renderer/pepper/pepper_host_factory_qt.h
+++ b/src/core/renderer/pepper/pepper_host_factory_qt.h
@@ -57,7 +57,7 @@ public:
     explicit PepperHostFactoryQt(content::BrowserPpapiHost* host);
     ~PepperHostFactoryQt() override;
 
-    virtual scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost(
+    virtual std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
             ppapi::host::PpapiHost* host,
             PP_Resource resource,
             PP_Instance instance,
diff --git a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp
index 636ca12f1..89f691cef 100644
--- a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp
+++ b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp
@@ -44,6 +44,8 @@
 
 #include "pepper_renderer_host_factory_qt.h"
 #include "pepper_flash_renderer_host_qt.h"
+
+#include "base/memory/ptr_util.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/host/resource_host.h"
@@ -63,7 +65,7 @@ PepperRendererHostFactoryQt::~PepperRendererHostFactoryQt()
 {
 }
 
-scoped_ptr<ppapi::host::ResourceHost> PepperRendererHostFactoryQt::CreateResourceHost(
+std::unique_ptr<ppapi::host::ResourceHost> PepperRendererHostFactoryQt::CreateResourceHost(
         ppapi::host::PpapiHost* host,
         PP_Resource resource,
         PP_Instance instance,
@@ -72,16 +74,14 @@ scoped_ptr<ppapi::host::ResourceHost> PepperRendererHostFactoryQt::CreateResourc
     DCHECK_EQ(host_->GetPpapiHost(), host);
 
     if (!host_->IsValidInstance(instance))
-        return scoped_ptr<ppapi::host::ResourceHost>();
+        return nullptr;
 
     if (host_->GetPpapiHost()->permissions().HasPermission(ppapi::PERMISSION_FLASH)
             && message.type() == PpapiHostMsg_Flash_Create::ID)
-            return scoped_ptr<ppapi::host::ResourceHost>(
-                        new PepperFlashRendererHostQt(host_,
-                                                      instance,
-                                                      resource));
+            return base::WrapUnique(
+                new PepperFlashRendererHostQt(host_, instance, resource));
 
-    return scoped_ptr<ppapi::host::ResourceHost>();
+    return nullptr;
 }
 
 } // QtWebEngineCore
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 bc472a7c6..ec3440a08 100644
--- a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h
+++ b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h
@@ -56,7 +56,7 @@ public:
     ~PepperRendererHostFactoryQt();
 
     // HostFactory.
-    scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost(
+    std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
             ppapi::host::PpapiHost* host,
             PP_Resource resource,
             PP_Instance instance,
diff --git a/src/core/renderer/render_view_observer_qt.cpp b/src/core/renderer/render_view_observer_qt.cpp
index 4b44a9bd9..68c0fc08f 100644
--- a/src/core/renderer/render_view_observer_qt.cpp
+++ b/src/core/renderer/render_view_observer_qt.cpp
@@ -46,6 +46,9 @@
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
+#include "third_party/WebKit/public/web/WebFrameContentDumper.h"
+#include "third_party/WebKit/public/web/WebFrameWidget.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 RenderViewObserverQt::RenderViewObserverQt(
@@ -58,23 +61,26 @@ RenderViewObserverQt::RenderViewObserverQt(
 
 void RenderViewObserverQt::onFetchDocumentMarkup(quint64 requestId)
 {
-    Send(new RenderViewObserverHostQt_DidFetchDocumentMarkup(
-        routing_id(),
-        requestId,
-        render_view()->GetWebView()->mainFrame()->contentAsMarkup()));
+    blink::WebString markup;
+    if (render_view()->GetWebView()->mainFrame()->isWebLocalFrame())
+        markup = blink::WebFrameContentDumper::dumpAsMarkup(
+                    static_cast<blink::WebLocalFrame*>(render_view()->GetWebView()->mainFrame()));
+    Send(new RenderViewObserverHostQt_DidFetchDocumentMarkup(routing_id(), requestId, markup));
 }
 
 void RenderViewObserverQt::onFetchDocumentInnerText(quint64 requestId)
 {
-    Send(new RenderViewObserverHostQt_DidFetchDocumentInnerText(
-        routing_id(),
-        requestId,
-        render_view()->GetWebView()->mainFrame()->contentAsText(std::numeric_limits<std::size_t>::max())));
+    blink::WebString text;
+    if (render_view()->GetWebView()->mainFrame()->isWebLocalFrame())
+        text = blink::WebFrameContentDumper::deprecatedDumpFrameTreeAsText(
+                    static_cast<blink::WebLocalFrame*>(render_view()->GetWebView()->mainFrame()),
+                    std::numeric_limits<std::size_t>::max());
+    Send(new RenderViewObserverHostQt_DidFetchDocumentInnerText(routing_id(), requestId, text));
 }
 
 void RenderViewObserverQt::onSetBackgroundColor(quint32 color)
 {
-    render_view()->GetWebView()->setBaseBackgroundColor(color);
+    render_view()->GetWebFrameWidget()->setBaseBackgroundColor(color);
 }
 
 void RenderViewObserverQt::OnFirstVisuallyNonEmptyLayout()