fixup! [M48_2564] Chromium upversion to m48_2564 branch

The arguments of |ContentRendererClient::GetNavigationErrorStrings|
changed in upstream (https://codereview.chromium.org/1406303002).
This CL adapts the code accordingly.

Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15386

Reviewed by: a1.gomes, hyuki.kim, sns.park

Change-Id: I5ceee5ef9c9a3dbea8344e6ae097e394768a7474
Signed-off-by: KangYong Park <kaka.park@samsung.com>

diff --git a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
index a654a88..5076775 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
@@ -107,12 +107,8 @@ void RenderFrameObserverEfl::OnLoadNotFoundErrorPage(std::string errorUrl) {
   bool replace = true;
 
   std::string error_html;
-#if !defined(EWK_BRINGUP)
-// [M48_2564] Temporary disabling the codes for switching to new chromium
-//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15386
   GetContentClientExport()->renderer()->GetNavigationErrorStrings(
-      render_frame()->GetRenderView(), frame, failed_request, error, &error_html, NULL);
-#endif
+      render_frame(), failed_request, error, &error_html, NULL);
 
   frame->loadHTMLString(error_html,
                        GURL(kUnreachableWebDataURL),