From 0351ab9aef03dad0fd12d04607a07ee84f05c4b2 Mon Sep 17 00:00:00 2001
From: Chandan Padhi <c.padhi@samsung.com>
Date: Fri, 11 Sep 2020 18:47:36 +0530
Subject: [PATCH] [M85 Dev][EFL] Fix compilation errors for desktop build

This commit resolves compilation errors to enable EFL port.

Change-Id: I8fb3a119a3ab2d5971b880e17fe8bb304befd3a4
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>
---
 base/numerics/checked_math.h                       |  22 +-
 base/numerics/checked_math_impl.h                  |   2 +-
 base/numerics/clamped_math.h                       |  20 +-
 base/numerics/safe_math_shared_impl.h              |   3 +-
 .../task/sequence_manager/sequence_manager_impl.cc |   2 +-
 base/trace_event/trace_arguments.h                 |  16 +-
 build/config/ui.gni                                |   2 +-
 content/common/cursors/webcursor.h                 |   2 +-
 content/public/common/input_event_ack_state.h      |   2 +
 content/renderer/render_thread_impl.h              |   2 +-
 .../client/gles2_implementation_efl_autogen.h      | 311 +++++++++------------
 .../gles2_implementation_efl_header_autogen.h      | 154 ++++------
 tizen_src/build/config/compiler/BUILD.gn           |   7 +-
 .../base/message_loop/message_pump_ecore.cc        |   7 +-
 .../base/message_loop/message_pump_for_ui_efl.cc   |   5 +-
 .../compositor/evasgl_delegated_frame_host.cc      |  11 +-
 .../browser/compositor/evasgl_output_surface.cc    |  20 +-
 .../browser/compositor/evasgl_output_surface.h     |   8 +-
 .../renderer_host/disambiguation_popup_efl.h       |   1 +
 .../renderer_host/render_widget_host_view_efl.cc   |  80 +++---
 .../renderer_host/render_widget_host_view_efl.h    |  27 +-
 .../browser/renderer_host/web_event_factory_efl.cc |  37 ++-
 .../browser/renderer_host/web_event_factory_efl.h  |   2 +-
 .../content/browser/selection/selection_box_efl.h  |   4 +-
 .../browser/selection/selection_controller_efl.cc  |  24 +-
 .../browser/selection/selection_controller_efl.h   |   4 +-
 .../browser/web_contents/web_contents_impl_efl.cc  |   8 +-
 .../browser/web_contents/web_contents_impl_efl.h   |   5 +-
 .../browser/web_contents/web_contents_view_efl.cc  |  14 +-
 .../browser/web_contents/web_contents_view_efl.h   |  14 +-
 .../browser/web_contents/web_drag_dest_efl.h       |   2 +-
 .../browser/web_contents/web_drag_source_efl.cc    |   4 +-
 .../browser/web_contents/web_drag_source_efl.h     |   2 +-
 .../content/common/cursors/webcursor_efl.cc        |  11 +-
 .../browser/web_contents_view_efl_delegate.h       |   6 +-
 .../content/shell/browser/shell_efl.cc             |  25 +-
 .../shell_web_contents_view_delegate_efl.cc        |  17 +-
 tizen_src/chromium_impl/efl/init.cc                |   1 -
 tizen_src/chromium_impl/efl/window_factory.cc      |   1 +
 .../client/gles2_implementation_efl.cc             |  12 +-
 .../client/gles2_implementation_efl.h              |   5 +-
 .../client/shared_mailbox_manager.cc               |   2 +-
 tizen_src/chromium_impl/ui/BUILD.gn                |   5 +-
 .../ui/base/clipboard/clipboard_helper_efl.h       |   3 +-
 tizen_src/chromium_impl/ui/display/screen_efl.cc   |  10 +-
 .../chromium_impl/ui/gl/gl_shared_context_efl.cc   |   3 +-
 .../chromium_impl/ui/ozone/ozone_platform_efl.cc   |  27 +-
 .../chromium_impl/ui/ozone/surface_factory_efl.cc  |  11 +-
 .../chromium_impl/ui/snapshot/snapshot_efl.cc      |   6 +-
 tizen_src/ewk/efl_integration/BUILD.gn             |   8 +-
 .../browser/browsing_data_remover_efl.cc           |  30 +-
 .../browser/download_manager_delegate_efl.cc       |  39 +--
 .../browser/download_manager_delegate_efl.h        |  23 +-
 .../browser/favicon/favicon_database.cc            |   3 +-
 .../browser/favicon/favicon_database_p.cc          |   3 +-
 .../browser/favicon/favicon_downloader.cc          |  13 +-
 .../efl_integration/browser/login_delegate_efl.cc  |  23 +-
 .../browser/policy_response_delegate_efl.cc        |  19 +-
 .../browser/policy_response_delegate_efl.h         |   3 -
 .../browser/quota_permission_context_efl.cc        |  23 +-
 .../browser/quota_permission_context_efl.h         |   4 +-
 .../resource_dispatcher_host_delegate_efl.cc       |   1 -
 .../resource_dispatcher_host_delegate_efl.h        |   2 -
 .../browser/resource_throttle_efl.cc               |   6 +-
 .../browser/resource_throttle_efl.h                |  28 +-
 .../browser/selectpicker/popup_menu_item.cc        |   8 +-
 .../browser/selectpicker/popup_menu_item.h         |   6 +-
 .../browser/selectpicker/popup_menu_item_private.h |   4 +-
 .../ewk/efl_integration/browser/sound_effect.cc    |   2 +-
 .../browser/ssl_host_state_delegate_efl.cc         |  14 +-
 .../browser/ssl_host_state_delegate_efl.h          |  17 +-
 .../ewk/efl_integration/browser_context_efl.cc     |  31 +-
 .../ewk/efl_integration/browser_context_efl.h      |  23 +-
 tizen_src/ewk/efl_integration/command_line_efl.cc  |   1 +
 .../efl_integration/common/content_client_efl.cc   |   6 +-
 .../efl_integration/common/content_client_efl.h    |   9 +-
 .../efl_integration/common/print_pages_params.cc   |   2 +-
 .../efl_integration/common/print_pages_params.h    |   8 +-
 .../efl_integration/common/render_messages_ewk.h   |   2 +
 .../efl_integration/content_browser_client_efl.cc  |  25 +-
 .../efl_integration/content_browser_client_efl.h   |  60 ++--
 .../efl_integration/content_main_delegate_efl.cc   |   1 -
 .../efl_integration/context_menu_controller_efl.cc |  18 +-
 .../efl_integration/context_menu_controller_efl.h  |   4 +-
 tizen_src/ewk/efl_integration/cookie_manager.cc    |  53 ++--
 tizen_src/ewk/efl_integration/cookie_manager.h     |   5 +-
 .../ewk/efl_integration/devtools_delegate_efl.cc   |   2 +-
 tizen_src/ewk/efl_integration/eweb_context.cc      |  65 +++--
 tizen_src/ewk/efl_integration/eweb_view.cc         |  70 ++---
 tizen_src/ewk/efl_integration/eweb_view.h          |   4 +-
 tizen_src/ewk/efl_integration/ewk_global_data.cc   |   4 +-
 .../ewk/efl_integration/ipc_message_start_ewk.h    |   2 +-
 tizen_src/ewk/efl_integration/locale_efl.cc        |   5 +-
 .../ewk/efl_integration/network_delegate_efl.cc    |   5 +-
 .../ewk/efl_integration/network_delegate_efl.h     |   5 +-
 .../private/ewk_policy_decision_private.cc         |   1 -
 .../private/ewk_policy_decision_private.h          |   4 -
 tizen_src/ewk/efl_integration/public/ewk_view.cc   |  19 +-
 .../renderer/content_renderer_client_efl.cc        |  37 +--
 .../renderer/content_renderer_client_efl.h         |  12 +-
 .../renderer/print_web_view_helper_efl.cc          |   4 +-
 .../renderer/render_frame_observer_efl.cc          |   1 -
 .../renderer/render_view_observer_efl.cc           |  10 +-
 .../renderer/render_view_observer_efl.h            |   2 +-
 .../url_request_context_getter_efl.cc              |  38 +--
 .../url_request_context_getter_efl.h               |   4 +-
 .../efl_integration/web_contents_delegate_efl.cc   |  79 +++---
 .../efl_integration/web_contents_delegate_efl.h    |  57 ++--
 tizen_src/ewk/efl_integration/wrt/v8widget.cc      |   2 +-
 .../ewk/efl_integration/wrt/wrt_widget_host.cc     |   3 +-
 110 files changed, 921 insertions(+), 1010 deletions(-)

diff --git a/base/numerics/checked_math.h b/base/numerics/checked_math.h
index 814b9e4..ede3344 100644
--- a/base/numerics/checked_math.h
+++ b/base/numerics/checked_math.h
@@ -117,25 +117,25 @@ class CheckedNumeric {
 
   // Prototypes for the supported arithmetic operator overloads.
   template <typename Src>
-  CheckedNumeric& operator+=(const Src rhs);
+  constexpr CheckedNumeric& operator+=(const Src rhs);
   template <typename Src>
-  CheckedNumeric& operator-=(const Src rhs);
+  constexpr CheckedNumeric& operator-=(const Src rhs);
   template <typename Src>
-  CheckedNumeric& operator*=(const Src rhs);
+  constexpr CheckedNumeric& operator*=(const Src rhs);
   template <typename Src>
-  CheckedNumeric& operator/=(const Src rhs);
+  constexpr CheckedNumeric& operator/=(const Src rhs);
   template <typename Src>
-  CheckedNumeric& operator%=(const Src rhs);
+  constexpr CheckedNumeric& operator%=(const Src rhs);
   template <typename Src>
-  CheckedNumeric& operator<<=(const Src rhs);
+  constexpr CheckedNumeric& operator<<=(const Src rhs);
   template <typename Src>
-  CheckedNumeric& operator>>=(const Src rhs);
+  constexpr CheckedNumeric& operator>>=(const Src rhs);
   template <typename Src>
-  CheckedNumeric& operator&=(const Src rhs);
+  constexpr CheckedNumeric& operator&=(const Src rhs);
   template <typename Src>
-  CheckedNumeric& operator|=(const Src rhs);
+  constexpr CheckedNumeric& operator|=(const Src rhs);
   template <typename Src>
-  CheckedNumeric& operator^=(const Src rhs);
+  constexpr CheckedNumeric& operator^=(const Src rhs);
 
   constexpr CheckedNumeric operator-() const {
     // The negation of two's complement int min is int min, so we simply
@@ -238,7 +238,7 @@ class CheckedNumeric {
 
   // Assignment arithmetic operations.
   template <template <typename, typename, typename> class M, typename R>
-  CheckedNumeric& MathOp(const R rhs) {
+  constexpr CheckedNumeric& MathOp(const R rhs) {
     using Math = typename MathWrapper<M, T, R>::math;
     T result = 0;  // Using T as the destination saves a range check.
     bool is_valid = state_.is_valid() && Wrapper<R>::is_valid(rhs) &&
diff --git a/base/numerics/checked_math_impl.h b/base/numerics/checked_math_impl.h
index c13b891..b6cc296 100644
--- a/base/numerics/checked_math_impl.h
+++ b/base/numerics/checked_math_impl.h
@@ -48,7 +48,7 @@ struct CheckedAddOp<T,
                                             std::is_integral<U>::value>::type> {
   using result_type = typename MaxExponentPromotion<T, U>::type;
   template <typename V>
-  static bool Do(T x, U y, V* result) {
+  static constexpr bool Do(T x, U y, V* result) {
     // TODO(jschuh) Make this "constexpr if" once we're C++17.
     if (CheckedAddFastOp<T, U>::is_supported)
       return CheckedAddFastOp<T, U>::Do(x, y, result);
diff --git a/base/numerics/clamped_math.h b/base/numerics/clamped_math.h
index 30f2b1b..37a4cfd 100644
--- a/base/numerics/clamped_math.h
+++ b/base/numerics/clamped_math.h
@@ -57,25 +57,25 @@ class ClampedNumeric {
 
   // Prototypes for the supported arithmetic operator overloads.
   template <typename Src>
-  ClampedNumeric& operator+=(const Src rhs);
+  constexpr ClampedNumeric& operator+=(const Src rhs);
   template <typename Src>
-  ClampedNumeric& operator-=(const Src rhs);
+  constexpr ClampedNumeric& operator-=(const Src rhs);
   template <typename Src>
-  ClampedNumeric& operator*=(const Src rhs);
+  constexpr ClampedNumeric& operator*=(const Src rhs);
   template <typename Src>
-  ClampedNumeric& operator/=(const Src rhs);
+  constexpr ClampedNumeric& operator/=(const Src rhs);
   template <typename Src>
-  ClampedNumeric& operator%=(const Src rhs);
+  constexpr ClampedNumeric& operator%=(const Src rhs);
   template <typename Src>
-  ClampedNumeric& operator<<=(const Src rhs);
+  constexpr ClampedNumeric& operator<<=(const Src rhs);
   template <typename Src>
-  ClampedNumeric& operator>>=(const Src rhs);
+  constexpr ClampedNumeric& operator>>=(const Src rhs);
   template <typename Src>
-  ClampedNumeric& operator&=(const Src rhs);
+  constexpr ClampedNumeric& operator&=(const Src rhs);
   template <typename Src>
-  ClampedNumeric& operator|=(const Src rhs);
+  constexpr ClampedNumeric& operator|=(const Src rhs);
   template <typename Src>
-  ClampedNumeric& operator^=(const Src rhs);
+  constexpr ClampedNumeric& operator^=(const Src rhs);
 
   constexpr ClampedNumeric operator-() const {
     // The negation of two's complement int min is int min, so that's the
diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
index c3b48fa..3556b1e 100644
--- a/base/numerics/safe_math_shared_impl.h
+++ b/base/numerics/safe_math_shared_impl.h
@@ -227,7 +227,8 @@ struct ResultType {
   /* Assignment arithmetic operator implementation from CLASS##Numeric. */     \
   template <typename L>                                                        \
   template <typename R>                                                        \
-  CLASS##Numeric<L>& CLASS##Numeric<L>::operator CMP_OP(const R rhs) {         \
+  constexpr CLASS##Numeric<L>& CLASS##Numeric<L>::operator CMP_OP(             \
+      const R rhs) {                                                           \
     return MathOp<CLASS##OP_NAME##Op>(rhs);                                    \
   }                                                                            \
   /* Variadic arithmetic functions that return CLASS##Numeric. */              \
diff --git a/base/task/sequence_manager/sequence_manager_impl.cc b/base/task/sequence_manager/sequence_manager_impl.cc
index bdad099..302062d 100644
--- a/base/task/sequence_manager/sequence_manager_impl.cc
+++ b/base/task/sequence_manager/sequence_manager_impl.cc
@@ -313,7 +313,7 @@ void SequenceManagerImpl::BindToMessagePump(std::unique_ptr<MessagePump> pump) {
     controller_->AttachToMessagePump();
   }
 #elif defined(USE_EFL)
-  if (settings_.message_loop_type == MessagePump::Type::UI)
+  if (settings_.message_loop_type == MessagePumpType::UI)
     controller_->AttachToMessagePump();
 #endif
 }
diff --git a/base/trace_event/trace_arguments.h b/base/trace_event/trace_arguments.h
index cfc771f..cf2f297 100644
--- a/base/trace_event/trace_arguments.h
+++ b/base/trace_event/trace_arguments.h
@@ -484,21 +484,21 @@ class BASE_EXPORT StringStorage {
   void Reset(size_t alloc_size = 0);
 
   // Accessors.
-  size_t size() const { return data_ ? data_->size : 0u; }
-  const char* data() const { return data_ ? data_->chars : nullptr; }
-  char* data() { return data_ ? data_->chars : nullptr; }
+  constexpr size_t size() const { return data_ ? data_->size : 0u; }
+  constexpr const char* data() const { return data_ ? data_->chars : nullptr; }
+  constexpr char* data() { return data_ ? data_->chars : nullptr; }
 
-  const char* begin() const { return data(); }
-  const char* end() const { return data() + size(); }
+  constexpr const char* begin() const { return data(); }
+  constexpr const char* end() const { return data() + size(); }
   inline char* begin() { return data(); }
   inline char* end() { return data() + size(); }
 
   // True iff storage is empty.
-  bool empty() const { return size() == 0; }
+  constexpr bool empty() const { return size() == 0; }
 
   // Returns true if |ptr| is inside the storage area, false otherwise.
   // Used during unit-testing.
-  bool Contains(const void* ptr) const {
+  constexpr bool Contains(const void* ptr) const {
     const char* char_ptr = static_cast<const char*>(ptr);
     return (char_ptr >= begin() && char_ptr < end());
   }
@@ -509,7 +509,7 @@ class BASE_EXPORT StringStorage {
 
   // Return an estimate of the memory overhead of this instance. This doesn't
   // count the size of |data_| itself.
-  size_t EstimateTraceMemoryOverhead() const {
+  constexpr size_t EstimateTraceMemoryOverhead() const {
     return data_ ? sizeof(size_t) + data_->size : 0u;
   }
 
diff --git a/build/config/ui.gni b/build/config/ui.gni
index d1ffa27..0eaed08 100644
--- a/build/config/ui.gni
+++ b/build/config/ui.gni
@@ -34,7 +34,7 @@ declare_args() {
   toolkit_views = is_mac || is_win || (is_linux && !use_efl) || is_fuchsia
 
   # Whether we should use glib, a low level C utility library.
-  use_glib = (is_desktop_linux && !is_chromecast) || use_efl
+  use_glib = is_desktop_linux && !is_chromecast
 }
 
 # Additional dependent variables -----------------------------------------------
diff --git a/content/common/cursors/webcursor.h b/content/common/cursors/webcursor.h
index 4b14cb3..c677185 100644
--- a/content/common/cursors/webcursor.h
+++ b/content/common/cursors/webcursor.h
@@ -90,7 +90,7 @@ class CONTENT_EXPORT WebCursor {
   gfx::Size maximum_cursor_size_ = {kDefaultMaxSize, kDefaultMaxSize};
 #endif
 
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(USE_EFL)
   base::Optional<ui::Cursor> custom_cursor_;
 #endif
 };
diff --git a/content/public/common/input_event_ack_state.h b/content/public/common/input_event_ack_state.h
index 06a462f..8f81ffe 100644
--- a/content/public/common/input_event_ack_state.h
+++ b/content/public/common/input_event_ack_state.h
@@ -5,6 +5,8 @@
 #ifndef CONTENT_PUBLIC_COMMON_INPUT_EVENT_ACK_STATE_H_
 #define CONTENT_PUBLIC_COMMON_INPUT_EVENT_ACK_STATE_H_
 
+#include "third_party/blink/public/mojom/input/input_event_result.mojom-shared.h"
+
 namespace content {
 
 const char* InputEventResultStateToString(
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 12cea1f..d96bbad 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -582,7 +582,7 @@ class CONTENT_EXPORT RenderThreadImpl
   scoped_refptr<viz::RasterContextProvider>
       video_frame_compositor_context_provider_;
 
-  scoped_refptr<ws::ContextProviderCommandBuffer>
+  scoped_refptr<viz::ContextProviderCommandBuffer>
       shared_worker_context_provider_;
 
   std::unique_ptr<AudioRendererMixerManager> audio_renderer_mixer_manager_;
diff --git a/gpu/command_buffer/client/gles2_implementation_efl_autogen.h b/gpu/command_buffer/client/gles2_implementation_efl_autogen.h
index 6c154dd..7c317a1 100644
--- a/gpu/command_buffer/client/gles2_implementation_efl_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_efl_autogen.h
@@ -512,6 +512,12 @@ void GLES2ImplementationEfl::GetBooleanv(GLenum pname, GLboolean* params) {
   evas_gl_api_->glGetBooleanv(pname, params);
 }
 
+void GLES2ImplementationEfl::GetBooleani_v(GLenum /* pname */,
+                                           GLuint /* index */,
+                                           GLboolean* /* data */) {
+  NOTIMPLEMENTED();
+}
+
 void GLES2ImplementationEfl::GetBufferParameteri64v(GLenum /* target */,
                                                     GLenum /* pname */,
                                                     GLint64* /* params */) {
@@ -934,6 +940,16 @@ void GLES2ImplementationEfl::MultiDrawArraysInstancedWEBGL(
   NOTIMPLEMENTED();
 }
 
+void GLES2ImplementationEfl::MultiDrawArraysInstancedBaseInstanceWEBGL(
+    GLenum /* mode */,
+    const GLint* /* firsts */,
+    const GLsizei* /* counts */,
+    const GLsizei* /* instance_counts */,
+    const GLuint* /* baseinstances */,
+    GLsizei /* drawcount */) {
+  NOTIMPLEMENTED();
+}
+
 void GLES2ImplementationEfl::MultiDrawElementsWEBGL(
     GLenum /* mode */,
     const GLsizei* /* counts */,
@@ -953,6 +969,19 @@ void GLES2ImplementationEfl::MultiDrawElementsInstancedWEBGL(
   NOTIMPLEMENTED();
 }
 
+void GLES2ImplementationEfl::
+    MultiDrawElementsInstancedBaseVertexBaseInstanceWEBGL(
+        GLenum /* mode */,
+        const GLsizei* /* counts */,
+        GLenum /* type */,
+        const GLsizei* /* offsets */,
+        const GLsizei* /* instance_counts */,
+        const GLint* /* basevertices */,
+        const GLuint* /* baseinstances */,
+        GLsizei /* drawcount */) {
+  NOTIMPLEMENTED();
+}
+
 void GLES2ImplementationEfl::StencilFunc(GLenum func, GLint ref, GLuint mask) {
   evas_gl_api_->glStencilFunc(func, ref, mask);
 }
@@ -1585,6 +1614,21 @@ void GLES2ImplementationEfl::DispatchCompute(GLuint /* num_groups_x */,
   NOTIMPLEMENTED();
 }
 
+void GLES2ImplementationEfl::DispatchComputeIndirect(GLintptr /* offset */) {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::DrawArraysIndirect(GLenum /* mode */,
+                                                const void* /* offset */) {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::DrawElementsIndirect(GLenum /* mode */,
+                                                  GLenum /* type */,
+                                                  const void* /* offset */) {
+  NOTIMPLEMENTED();
+}
+
 void GLES2ImplementationEfl::GetProgramInterfaceiv(
     GLuint /* program */,
     GLenum /* program_interface */,
@@ -1721,7 +1765,7 @@ void GLES2ImplementationEfl::UnmapTexSubImage2DCHROMIUM(const void* /* mem */) {
 void GLES2ImplementationEfl::ResizeCHROMIUM(GLuint /* width */,
                                             GLuint /* height */,
                                             GLfloat /* scale_factor */,
-                                            GLenum /* color_space */,
+                                            GLcolorSpace /* color_space */,
                                             GLboolean /* alpha */) {
   NOTIMPLEMENTED();
 }
@@ -1838,6 +1882,15 @@ void GLES2ImplementationEfl::DrawArraysInstancedANGLE(GLenum /* mode */,
   NOTIMPLEMENTED();
 }
 
+void GLES2ImplementationEfl::DrawArraysInstancedBaseInstanceANGLE(
+    GLenum /* mode */,
+    GLint /* first */,
+    GLsizei /* count */,
+    GLsizei /* primcount */,
+    GLuint /* baseinstance */) {
+  NOTIMPLEMENTED();
+}
+
 void GLES2ImplementationEfl::DrawElementsInstancedANGLE(
     GLenum /* mode */,
     GLsizei /* count */,
@@ -1847,6 +1900,17 @@ void GLES2ImplementationEfl::DrawElementsInstancedANGLE(
   NOTIMPLEMENTED();
 }
 
+void GLES2ImplementationEfl::DrawElementsInstancedBaseVertexBaseInstanceANGLE(
+    GLenum /* mode */,
+    GLsizei /* count */,
+    GLenum /* type */,
+    const void* /* indices */,
+    GLsizei /* primcount */,
+    GLint /* basevertex */,
+    GLuint /* baseinstance */) {
+  NOTIMPLEMENTED();
+}
+
 void GLES2ImplementationEfl::VertexAttribDivisorANGLE(GLuint /* index */,
                                                       GLuint /* divisor */) {
   NOTIMPLEMENTED();
@@ -1947,6 +2011,7 @@ void GLES2ImplementationEfl::ScheduleCALayerSharedStateCHROMIUM(
     GLfloat /* opacity */,
     GLboolean /* is_clipped */,
     const GLfloat* /* clip_rect */,
+    const GLfloat* /* rounded_corner_bounds */,
     GLint /* sorting_context_id */,
     const GLfloat* /* transform */) {
   NOTIMPLEMENTED();
@@ -1984,8 +2049,8 @@ GLuint GLES2ImplementationEfl::GetLastFlushIdCHROMIUM() {
 }
 
 void GLES2ImplementationEfl::ScheduleDCLayerCHROMIUM(
-    GLuint /* y_texture_id */,
-    GLuint /* uv_texture_id */,
+    GLuint /* texture_0 */,
+    GLuint /* texture_1 */,
     GLint /* z_order */,
     GLint /* content_x */,
     GLint /* content_y */,
@@ -2014,181 +2079,8 @@ void GLES2ImplementationEfl::SetActiveURLCHROMIUM(const char* /* url */) {
   NOTIMPLEMENTED();
 }
 
-void GLES2ImplementationEfl::MatrixLoadfCHROMIUM(GLenum /* matrixMode */,
-                                                 const GLfloat* /* m */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::MatrixLoadIdentityCHROMIUM(
-    GLenum /* matrixMode */) {
-  NOTIMPLEMENTED();
-}
-
-GLuint GLES2ImplementationEfl::GenPathsCHROMIUM(GLsizei /* range */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::DeletePathsCHROMIUM(GLuint /* path */,
-                                                 GLsizei /* range */) {
-  NOTIMPLEMENTED();
-}
-
-GLboolean GLES2ImplementationEfl::IsPathCHROMIUM(GLuint /* path */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::PathCommandsCHROMIUM(GLuint /* path */,
-                                                  GLsizei /* numCommands */,
-                                                  const GLubyte* /* commands */,
-                                                  GLsizei /* numCoords */,
-                                                  GLenum /* coordType */,
-                                                  const GLvoid* /* coords */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::PathParameterfCHROMIUM(GLuint /* path */,
-                                                    GLenum /* pname */,
-                                                    GLfloat /* value */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::PathParameteriCHROMIUM(GLuint /* path */,
-                                                    GLenum /* pname */,
-                                                    GLint /* value */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::PathStencilFuncCHROMIUM(GLenum /* func */,
-                                                     GLint /* ref */,
-                                                     GLuint /* mask */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::StencilFillPathCHROMIUM(GLuint /* path */,
-                                                     GLenum /* fillMode */,
-                                                     GLuint /* mask */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::StencilStrokePathCHROMIUM(GLuint /* path */,
-                                                       GLint /* reference */,
-                                                       GLuint /* mask */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::CoverFillPathCHROMIUM(GLuint /* path */,
-                                                   GLenum /* coverMode */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::CoverStrokePathCHROMIUM(GLuint /* path */,
-                                                     GLenum /* coverMode */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::StencilThenCoverFillPathCHROMIUM(
-    GLuint /* path */,
-    GLenum /* fillMode */,
-    GLuint /* mask */,
-    GLenum /* coverMode */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::StencilThenCoverStrokePathCHROMIUM(
-    GLuint /* path */,
-    GLint /* reference */,
-    GLuint /* mask */,
-    GLenum /* coverMode */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::StencilFillPathInstancedCHROMIUM(
-    GLsizei /* numPaths */,
-    GLenum /* pathNameType */,
-    const GLvoid* /* paths */,
-    GLuint /* pathBase */,
-    GLenum /* fillMode */,
-    GLuint /* mask */,
-    GLenum /* transformType */,
-    const GLfloat* /* transformValues */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::StencilStrokePathInstancedCHROMIUM(
-    GLsizei /* numPaths */,
-    GLenum /* pathNameType */,
-    const GLvoid* /* paths */,
-    GLuint /* pathBase */,
-    GLint /* reference */,
-    GLuint /* mask */,
-    GLenum /* transformType */,
-    const GLfloat* /* transformValues */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::CoverFillPathInstancedCHROMIUM(
-    GLsizei /* numPaths */,
-    GLenum /* pathNameType */,
-    const GLvoid* /* paths */,
-    GLuint /* pathBase */,
-    GLenum /* coverMode */,
-    GLenum /* transformType */,
-    const GLfloat* /* transformValues */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::CoverStrokePathInstancedCHROMIUM(
-    GLsizei /* numPaths */,
-    GLenum /* pathNameType */,
-    const GLvoid* /* paths */,
-    GLuint /* pathBase */,
-    GLenum /* coverMode */,
-    GLenum /* transformType */,
-    const GLfloat* /* transformValues */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::StencilThenCoverFillPathInstancedCHROMIUM(
-    GLsizei /* numPaths */,
-    GLenum /* pathNameType */,
-    const GLvoid* /* paths */,
-    GLuint /* pathBase */,
-    GLenum /* fillMode */,
-    GLuint /* mask */,
-    GLenum /* coverMode */,
-    GLenum /* transformType */,
-    const GLfloat* /* transformValues */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::StencilThenCoverStrokePathInstancedCHROMIUM(
-    GLsizei /* numPaths */,
-    GLenum /* pathNameType */,
-    const GLvoid* /* paths */,
-    GLuint /* pathBase */,
-    GLint /* reference */,
-    GLuint /* mask */,
-    GLenum /* coverMode */,
-    GLenum /* transformType */,
-    const GLfloat* /* transformValues */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BindFragmentInputLocationCHROMIUM(
-    GLuint /* program */,
-    GLint /* location */,
-    const char* /* name */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ProgramPathFragmentInputGenCHROMIUM(
-    GLuint /* program */,
-    GLint /* location */,
-    GLenum /* genMode */,
-    GLint /* components */,
-    const GLfloat* /* coeffs */) {
+void GLES2ImplementationEfl::ContextVisibilityHintCHROMIUM(
+    GLboolean /* visibility */) {
   NOTIMPLEMENTED();
 }
 
@@ -2206,10 +2098,6 @@ void GLES2ImplementationEfl::BlendBarrierKHR() {
   NOTIMPLEMENTED();
 }
 
-void GLES2ImplementationEfl::ApplyScreenSpaceAntialiasingCHROMIUM() {
-  NOTIMPLEMENTED();
-}
-
 void GLES2ImplementationEfl::BindFragDataLocationIndexedEXT(
     GLuint /* program */,
     GLuint /* colorNumber */,
@@ -2294,7 +2182,7 @@ void GLES2ImplementationEfl::TexStorage2DImageCHROMIUM(
 
 void GLES2ImplementationEfl::SetColorSpaceMetadataCHROMIUM(
     GLuint /* texture_id */,
-    GLColorSpace /* color_space */) {
+    GLcolorSpace /* color_space */) {
   NOTIMPLEMENTED();
 }
 
@@ -2368,4 +2256,61 @@ void GLES2ImplementationEfl::EndSharedImageAccessDirectCHROMIUM(
   NOTIMPLEMENTED();
 }
 
+void GLES2ImplementationEfl::BeginBatchReadAccessSharedImageCHROMIUM() {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::EndBatchReadAccessSharedImageCHROMIUM() {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::EnableiOES(GLenum /* target */,
+                                        GLuint /* index */) {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::DisableiOES(GLenum /* target */,
+                                         GLuint /* index */) {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::BlendEquationiOES(GLuint /* buf */,
+                                               GLenum /* mode */) {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::BlendEquationSeparateiOES(GLuint /* buf */,
+                                                       GLenum /* modeRGB */,
+                                                       GLenum /* modeAlpha */) {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::BlendFunciOES(GLuint /* buf */,
+                                           GLenum /* src */,
+                                           GLenum /* dst */) {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::BlendFuncSeparateiOES(GLuint /* buf */,
+                                                   GLenum /* srcRGB */,
+                                                   GLenum /* dstRGB */,
+                                                   GLenum /* srcAlpha */,
+                                                   GLenum /* dstAlpha */) {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::ColorMaskiOES(GLuint /* buf */,
+                                           GLboolean /* r */,
+                                           GLboolean /* g */,
+                                           GLboolean /* b */,
+                                           GLboolean /* a */) {
+  NOTIMPLEMENTED();
+}
+
+GLboolean GLES2ImplementationEfl::IsEnablediOES(GLenum /* target */,
+                                                GLuint /* index */) {
+  NOTIMPLEMENTED();
+  return 0;
+}
+
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_AUTOGEN_H_
diff --git a/gpu/command_buffer/client/gles2_implementation_efl_header_autogen.h b/gpu/command_buffer/client/gles2_implementation_efl_header_autogen.h
index 6f47c58..c5d648bc 100644
--- a/gpu/command_buffer/client/gles2_implementation_efl_header_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_efl_header_autogen.h
@@ -232,6 +232,7 @@ void GetAttachedShaders(GLuint program,
                         GLuint* shaders) override;
 GLint GetAttribLocation(GLuint program, const char* name) override;
 void GetBooleanv(GLenum pname, GLboolean* params) override;
+void GetBooleani_v(GLenum pname, GLuint index, GLboolean* data) override;
 void GetBufferParameteri64v(GLenum target,
                             GLenum pname,
                             GLint64* params) override;
@@ -382,6 +383,12 @@ void MultiDrawArraysInstancedWEBGL(GLenum mode,
                                    const GLsizei* counts,
                                    const GLsizei* instance_counts,
                                    GLsizei drawcount) override;
+void MultiDrawArraysInstancedBaseInstanceWEBGL(GLenum mode,
+                                               const GLint* firsts,
+                                               const GLsizei* counts,
+                                               const GLsizei* instance_counts,
+                                               const GLuint* baseinstances,
+                                               GLsizei drawcount) override;
 void MultiDrawElementsWEBGL(GLenum mode,
                             const GLsizei* counts,
                             GLenum type,
@@ -393,6 +400,15 @@ void MultiDrawElementsInstancedWEBGL(GLenum mode,
                                      const GLsizei* offsets,
                                      const GLsizei* instance_counts,
                                      GLsizei drawcount) override;
+void MultiDrawElementsInstancedBaseVertexBaseInstanceWEBGL(
+    GLenum mode,
+    const GLsizei* counts,
+    GLenum type,
+    const GLsizei* offsets,
+    const GLsizei* instance_counts,
+    const GLint* basevertices,
+    const GLuint* baseinstances,
+    GLsizei drawcount) override;
 void StencilFunc(GLenum func, GLint ref, GLuint mask) override;
 void StencilFuncSeparate(GLenum face,
                          GLenum func,
@@ -633,6 +649,11 @@ void BindImageTexture(GLuint unit,
 void DispatchCompute(GLuint num_groups_x,
                      GLuint num_groups_y,
                      GLuint num_groups_z) override;
+void DispatchComputeIndirect(GLintptr offset) override;
+void DrawArraysIndirect(GLenum mode, const void* offset) override;
+void DrawElementsIndirect(GLenum mode,
+                          GLenum type,
+                          const void* offset) override;
 void GetProgramInterfaceiv(GLuint program,
                            GLenum program_interface,
                            GLenum pname,
@@ -693,7 +714,7 @@ void UnmapTexSubImage2DCHROMIUM(const void* mem) override;
 void ResizeCHROMIUM(GLuint width,
                     GLuint height,
                     GLfloat scale_factor,
-                    GLenum color_space,
+                    GLcolorSpace color_space,
                     GLboolean alpha) override;
 const GLchar* GetRequestableExtensionsCHROMIUM() override;
 void RequestExtensionCHROMIUM(const char* extension) override;
@@ -757,11 +778,24 @@ void DrawArraysInstancedANGLE(GLenum mode,
                               GLint first,
                               GLsizei count,
                               GLsizei primcount) override;
+void DrawArraysInstancedBaseInstanceANGLE(GLenum mode,
+                                          GLint first,
+                                          GLsizei count,
+                                          GLsizei primcount,
+                                          GLuint baseinstance) override;
 void DrawElementsInstancedANGLE(GLenum mode,
                                 GLsizei count,
                                 GLenum type,
                                 const void* indices,
                                 GLsizei primcount) override;
+void DrawElementsInstancedBaseVertexBaseInstanceANGLE(
+    GLenum mode,
+    GLsizei count,
+    GLenum type,
+    const void* indices,
+    GLsizei primcount,
+    GLint basevertex,
+    GLuint baseinstance) override;
 void VertexAttribDivisorANGLE(GLuint index, GLuint divisor) override;
 void ProduceTextureDirectCHROMIUM(GLuint texture, GLbyte* mailbox) override;
 GLuint CreateAndConsumeTextureCHROMIUM(const GLbyte* mailbox) override;
@@ -804,6 +838,7 @@ void ScheduleOverlayPlaneCHROMIUM(GLint plane_z_order,
 void ScheduleCALayerSharedStateCHROMIUM(GLfloat opacity,
                                         GLboolean is_clipped,
                                         const GLfloat* clip_rect,
+                                        const GLfloat* rounded_corner_bounds,
                                         GLint sorting_context_id,
                                         const GLfloat* transform) override;
 void ScheduleCALayerCHROMIUM(GLuint contents_texture_id,
@@ -817,8 +852,8 @@ void ScheduleCALayerInUseQueryCHROMIUM(GLsizei count,
 void CommitOverlayPlanesCHROMIUM(GLuint64 swap_id, GLbitfield flags) override;
 void FlushDriverCachesCHROMIUM() override;
 GLuint GetLastFlushIdCHROMIUM() override;
-void ScheduleDCLayerCHROMIUM(GLuint y_texture_id,
-                             GLuint uv_texture_id,
+void ScheduleDCLayerCHROMIUM(GLuint texture_0,
+                             GLuint texture_1,
                              GLint z_order,
                              GLint content_x,
                              GLint content_y,
@@ -841,99 +876,10 @@ void ScheduleDCLayerCHROMIUM(GLuint y_texture_id,
                              GLint clip_height,
                              GLuint protected_video_type) override;
 void SetActiveURLCHROMIUM(const char* url) override;
-void MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat* m) override;
-void MatrixLoadIdentityCHROMIUM(GLenum matrixMode) override;
-GLuint GenPathsCHROMIUM(GLsizei range) override;
-void DeletePathsCHROMIUM(GLuint path, GLsizei range) override;
-GLboolean IsPathCHROMIUM(GLuint path) override;
-void PathCommandsCHROMIUM(GLuint path,
-                          GLsizei numCommands,
-                          const GLubyte* commands,
-                          GLsizei numCoords,
-                          GLenum coordType,
-                          const GLvoid* coords) override;
-void PathParameterfCHROMIUM(GLuint path, GLenum pname, GLfloat value) override;
-void PathParameteriCHROMIUM(GLuint path, GLenum pname, GLint value) override;
-void PathStencilFuncCHROMIUM(GLenum func, GLint ref, GLuint mask) override;
-void StencilFillPathCHROMIUM(GLuint path,
-                             GLenum fillMode,
-                             GLuint mask) override;
-void StencilStrokePathCHROMIUM(GLuint path,
-                               GLint reference,
-                               GLuint mask) override;
-void CoverFillPathCHROMIUM(GLuint path, GLenum coverMode) override;
-void CoverStrokePathCHROMIUM(GLuint path, GLenum coverMode) override;
-void StencilThenCoverFillPathCHROMIUM(GLuint path,
-                                      GLenum fillMode,
-                                      GLuint mask,
-                                      GLenum coverMode) override;
-void StencilThenCoverStrokePathCHROMIUM(GLuint path,
-                                        GLint reference,
-                                        GLuint mask,
-                                        GLenum coverMode) override;
-void StencilFillPathInstancedCHROMIUM(GLsizei numPaths,
-                                      GLenum pathNameType,
-                                      const GLvoid* paths,
-                                      GLuint pathBase,
-                                      GLenum fillMode,
-                                      GLuint mask,
-                                      GLenum transformType,
-                                      const GLfloat* transformValues) override;
-void StencilStrokePathInstancedCHROMIUM(
-    GLsizei numPaths,
-    GLenum pathNameType,
-    const GLvoid* paths,
-    GLuint pathBase,
-    GLint reference,
-    GLuint mask,
-    GLenum transformType,
-    const GLfloat* transformValues) override;
-void CoverFillPathInstancedCHROMIUM(GLsizei numPaths,
-                                    GLenum pathNameType,
-                                    const GLvoid* paths,
-                                    GLuint pathBase,
-                                    GLenum coverMode,
-                                    GLenum transformType,
-                                    const GLfloat* transformValues) override;
-void CoverStrokePathInstancedCHROMIUM(GLsizei numPaths,
-                                      GLenum pathNameType,
-                                      const GLvoid* paths,
-                                      GLuint pathBase,
-                                      GLenum coverMode,
-                                      GLenum transformType,
-                                      const GLfloat* transformValues) override;
-void StencilThenCoverFillPathInstancedCHROMIUM(
-    GLsizei numPaths,
-    GLenum pathNameType,
-    const GLvoid* paths,
-    GLuint pathBase,
-    GLenum fillMode,
-    GLuint mask,
-    GLenum coverMode,
-    GLenum transformType,
-    const GLfloat* transformValues) override;
-void StencilThenCoverStrokePathInstancedCHROMIUM(
-    GLsizei numPaths,
-    GLenum pathNameType,
-    const GLvoid* paths,
-    GLuint pathBase,
-    GLint reference,
-    GLuint mask,
-    GLenum coverMode,
-    GLenum transformType,
-    const GLfloat* transformValues) override;
-void BindFragmentInputLocationCHROMIUM(GLuint program,
-                                       GLint location,
-                                       const char* name) override;
-void ProgramPathFragmentInputGenCHROMIUM(GLuint program,
-                                         GLint location,
-                                         GLenum genMode,
-                                         GLint components,
-                                         const GLfloat* coeffs) override;
+void ContextVisibilityHintCHROMIUM(GLboolean visibility) override;
 void CoverageModulationCHROMIUM(GLenum components) override;
 GLenum GetGraphicsResetStatusKHR() override;
 void BlendBarrierKHR() override;
-void ApplyScreenSpaceAntialiasingCHROMIUM() override;
 void BindFragDataLocationIndexedEXT(GLuint program,
                                     GLuint colorNumber,
                                     GLuint index,
@@ -970,7 +916,7 @@ void TexStorage2DImageCHROMIUM(GLenum target,
                                GLsizei width,
                                GLsizei height) override;
 void SetColorSpaceMetadataCHROMIUM(GLuint texture_id,
-                                   GLColorSpace color_space) override;
+                                   GLcolorSpace color_space) override;
 void WindowRectanglesEXT(GLenum mode, GLsizei count, const GLint* box) override;
 GLuint CreateGpuFenceCHROMIUM() override;
 GLuint CreateClientGpuFenceCHROMIUM(ClientGpuFence source) override;
@@ -990,4 +936,24 @@ GLuint CreateAndTexStorage2DSharedImageWithInternalFormatCHROMIUM(
     GLenum internalformat) override;
 void BeginSharedImageAccessDirectCHROMIUM(GLuint texture, GLenum mode) override;
 void EndSharedImageAccessDirectCHROMIUM(GLuint texture) override;
+void BeginBatchReadAccessSharedImageCHROMIUM() override;
+void EndBatchReadAccessSharedImageCHROMIUM() override;
+void EnableiOES(GLenum target, GLuint index) override;
+void DisableiOES(GLenum target, GLuint index) override;
+void BlendEquationiOES(GLuint buf, GLenum mode) override;
+void BlendEquationSeparateiOES(GLuint buf,
+                               GLenum modeRGB,
+                               GLenum modeAlpha) override;
+void BlendFunciOES(GLuint buf, GLenum src, GLenum dst) override;
+void BlendFuncSeparateiOES(GLuint buf,
+                           GLenum srcRGB,
+                           GLenum dstRGB,
+                           GLenum srcAlpha,
+                           GLenum dstAlpha) override;
+void ColorMaskiOES(GLuint buf,
+                   GLboolean r,
+                   GLboolean g,
+                   GLboolean b,
+                   GLboolean a) override;
+GLboolean IsEnablediOES(GLenum target, GLuint index) override;
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_HEADER_AUTOGEN_H_
diff --git a/tizen_src/build/config/compiler/BUILD.gn b/tizen_src/build/config/compiler/BUILD.gn
index 17d3bb4..64f8490 100644
--- a/tizen_src/build/config/compiler/BUILD.gn
+++ b/tizen_src/build/config/compiler/BUILD.gn
@@ -23,6 +23,12 @@ config("tizen_default_include_dirs") {
 
     "//third_party/blink/renderer",
 
+    "//third_party/perfetto/include",
+    "$root_gen_dir/third_party/perfetto",
+    "$root_gen_dir/third_party/perfetto/build_config",
+
+    "$root_gen_dir/third_party/dawn/src/include",
+
     deps_include_path,
 
     # find / -name *.h -printf '%h\n' | sort --unique
@@ -125,7 +131,6 @@ config("tizen_default_include_dirs") {
       "$deps_lib_path/dbus-1.0/include",
       "$deps_lib_path/gstreamer-1.0/include",
       "$deps_lib_path/gstreamer-1.0/include/gst",
-      "//third_party/perfetto/include",
     ]
     if (is_clang) {
       include_dirs += [
diff --git a/tizen_src/chromium_impl/base/message_loop/message_pump_ecore.cc b/tizen_src/chromium_impl/base/message_loop/message_pump_ecore.cc
index fbe977a..ea79d76 100644
--- a/tizen_src/chromium_impl/base/message_loop/message_pump_ecore.cc
+++ b/tizen_src/chromium_impl/base/message_loop/message_pump_ecore.cc
@@ -5,8 +5,7 @@
 
 #include "base/message_loop/message_pump_ecore.h"
 
-#include "base/logging.h"
-#include "base/message_loop/message_loop.h"
+#include "base/notreached.h"
 
 // EFL version 1.8 and later don't define the function
 // in the Ecore.h. It's still defined and visible however.
@@ -56,12 +55,14 @@ void MessagePumpEcore::Run(Delegate* delegate) {
     if (state_->should_quit)
       break;
 
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
     more_work_is_plausible |= state_->delegate->DoWork();
     if (state_->should_quit)
       break;
 
     more_work_is_plausible |=
         state_->delegate->DoDelayedWork(&delayed_work_time_);
+#endif
     if (state_->should_quit)
       break;
 
@@ -110,6 +111,7 @@ void MessagePumpEcore::HandleScheduledWork() {
     work_scheduled_ = false;
   }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   if (state_->delegate->DoWork()) {
     ScheduleWork();
   }
@@ -118,6 +120,7 @@ void MessagePumpEcore::HandleScheduledWork() {
     return;
 
   state_->delegate->DoDelayedWork(&delayed_work_time_);
+#endif
 }
 
 } // namespace base
diff --git a/tizen_src/chromium_impl/base/message_loop/message_pump_for_ui_efl.cc b/tizen_src/chromium_impl/base/message_loop/message_pump_for_ui_efl.cc
index 9f82953..36ea76d 100644
--- a/tizen_src/chromium_impl/base/message_loop/message_pump_for_ui_efl.cc
+++ b/tizen_src/chromium_impl/base/message_loop/message_pump_for_ui_efl.cc
@@ -5,7 +5,6 @@
 #include "base/message_loop/message_pump_for_ui_efl.h"
 
 #include "base/command_line.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "cc/base/switches.h"
@@ -49,6 +48,7 @@ void MessagePumpForUIEfl::Run(base::MessagePump::Delegate* delegate) {
   bool previous_keep_running = keep_running_;
   keep_running_ = true;
 
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   for (;;) {
     bool did_work = delegate->DoWork();
     if (!keep_running_)
@@ -66,6 +66,7 @@ void MessagePumpForUIEfl::Run(base::MessagePump::Delegate* delegate) {
     if (!keep_running_)
       break;
   }
+#endif
 
   keep_running_ = previous_keep_running;
 }
@@ -164,6 +165,7 @@ void MessagePumpForUIEfl::DoWork() {
     DCHECK(result);
   }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   bool more_work_is_plausible = delegate_->DoWork();
 
   base::TimeTicks delayed_work_time;
@@ -182,6 +184,7 @@ void MessagePumpForUIEfl::DoWork() {
 
   if (!delayed_work_time.is_null())
     ScheduleDelayedWork(delayed_work_time);
+#endif
 }
 
 void MessagePumpForUIEfl::DoDelayedWork() {
diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc b/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc
index 4e06095..cc948b0 100644
--- a/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc
+++ b/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/compositor/evasgl_delegated_frame_host.h"
 
+#include "base/logging.h"
 #include "components/viz/common/quads/draw_quad.h"
 #include "components/viz/common/quads/render_pass.h"
 #include "components/viz/service/display/display_resource_provider.h"
@@ -41,11 +42,11 @@ void EvasGLDelegatedFrameHost::Initialize() {
 
   child_id_ = resource_provider_->CreateChild(
       base::Bind(&EvasGLDelegatedFrameHost::UnrefResources,
-                 weak_ptr_factory_.GetWeakPtr()),
-      true);
+                 weak_ptr_factory_.GetWeakPtr()));
 
   renderer_ = std::make_unique<viz::GLRenderer>(
-      &settings_, output_surface_.get(), resource_provider_.get(), nullptr);
+      &settings_, output_surface_.get(), resource_provider_.get(), nullptr,
+      nullptr);
   renderer_->Initialize();
   renderer_->SetVisible(true);
   is_initialized_ = true;
@@ -132,7 +133,7 @@ void EvasGLDelegatedFrameHost::RenderDelegatedFrame(const gfx::Rect& bounds) {
   renderer_->DecideRenderPassAllocationsForFrame(render_pass_list);
   // Draw frame by compositing render passes.
   renderer_->DrawFrame(&render_pass_list, display_info.GetDIPScale(),
-                       device_viewport_size);
+                       device_viewport_size, gfx::DisplayColorSpaces());
 }
 
 void EvasGLDelegatedFrameHost::UnrefResources(
@@ -160,7 +161,7 @@ void EvasGLDelegatedFrameHost::TransformRootRenderPass(
     // Normalize the matrix
     double m33 = matrix.getDouble(3, 3);
     if ((m33 != 0.0) && (m33 != 1.0)) {
-      SkMScalar scale = SK_MScalar1 / m33;
+      SkScalar scale = SK_Scalar1 / m33;
       for (int i = 0; i < 4; i++)
         for (int j = 0; j < 4; j++)
           matrix.setDouble(i, j, matrix.getDouble(i, j) * scale);
diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.cc b/tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.cc
index 37c9cd2..c49a51a 100644
--- a/tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.cc
+++ b/tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.cc
@@ -28,7 +28,7 @@ void EvasGLOutputSurface::SetDrawRectangle(const gfx::Rect& rect) {}
 void EvasGLOutputSurface::Reshape(const gfx::Size& size,
                                   float device_scale_factor,
                                   const gfx::ColorSpace& color_space,
-                                  bool has_alpha,
+                                  gfx::BufferFormat format,
                                   bool use_stencil) {}
 
 bool EvasGLOutputSurface::HasExternalStencilTest() const {
@@ -47,10 +47,6 @@ unsigned EvasGLOutputSurface::GetOverlayTextureId() const {
   return 0;
 }
 
-gfx::BufferFormat EvasGLOutputSurface::GetOverlayBufferFormat() const {
-  return gfx::BufferFormat::RGBX_8888;
-}
-
 uint32_t EvasGLOutputSurface::GetFramebufferCopyTextureFormat() {
   return 0;
 }
@@ -59,13 +55,19 @@ unsigned EvasGLOutputSurface::UpdateGpuFence() {
   return 0;
 }
 
-std::unique_ptr<viz::OverlayCandidateValidator>
-EvasGLOutputSurface::TakeOverlayCandidateValidator() {
+gfx::OverlayTransform EvasGLOutputSurface::GetDisplayTransform() {
+  return gfx::OVERLAY_TRANSFORM_NONE;
+}
+
+scoped_refptr<gpu::GpuTaskSchedulerHelper>
+EvasGLOutputSurface::GetGpuTaskSchedulerHelper() {
+  NOTIMPLEMENTED();
   return nullptr;
 }
 
-gfx::OverlayTransform EvasGLOutputSurface::GetDisplayTransform() {
-  return gfx::OVERLAY_TRANSFORM_NONE;
+gpu::MemoryTracker* EvasGLOutputSurface::GetMemoryTracker() {
+  NOTIMPLEMENTED();
+  return nullptr;
 }
 
 }  // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.h b/tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.h
index 24f8131..83e2f1f 100644
--- a/tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.h
+++ b/tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.h
@@ -27,22 +27,22 @@ class CONTENT_EXPORT EvasGLOutputSurface : public viz::OutputSurface {
   void Reshape(const gfx::Size& size,
                float device_scale_factor,
                const gfx::ColorSpace& color_space,
-               bool has_alpha,
+               gfx::BufferFormat format,
                bool use_stencil) override;
   bool HasExternalStencilTest() const override;
   void ApplyExternalStencil() override;
   void SwapBuffers(viz::OutputSurfaceFrame frame) override;
   bool IsDisplayedAsOverlayPlane() const override;
   unsigned GetOverlayTextureId() const override;
-  gfx::BufferFormat GetOverlayBufferFormat() const override;
   uint32_t GetFramebufferCopyTextureFormat() override;
   unsigned UpdateGpuFence() override;
-  std::unique_ptr<viz::OverlayCandidateValidator>
-  TakeOverlayCandidateValidator() override;
   void SetUpdateVSyncParametersCallback(
       viz::UpdateVSyncParametersCallback callback) override {}
   void SetDisplayTransformHint(gfx::OverlayTransform transform) override {}
   gfx::OverlayTransform GetDisplayTransform() override;
+  scoped_refptr<gpu::GpuTaskSchedulerHelper> GetGpuTaskSchedulerHelper()
+      override;
+  gpu::MemoryTracker* GetMemoryTracker() override;
 };
 
 }  // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/disambiguation_popup_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/disambiguation_popup_efl.h
index b4dd238..fb4e804 100644
--- a/tizen_src/chromium_impl/content/browser/renderer_host/disambiguation_popup_efl.h
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/disambiguation_popup_efl.h
@@ -7,6 +7,7 @@
 
 #include <Evas.h>
 
+#include "base/macros.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
index 585037a..c73a052 100644
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
@@ -17,7 +17,6 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -34,7 +33,6 @@
 #include "content/browser/renderer_host/web_event_factory_efl.h"
 #include "content/common/cursors/webcursor_efl.h"
 #include "content/common/input_messages.h"
-#include "content/common/text_input_state.h"
 #include "content/common/view_messages.h"
 #include "content/common/widget_messages.h"
 #include "content/public/browser/browser_thread.h"
@@ -47,9 +45,8 @@
 #include "media/base/video_frame.h"
 #include "media/base/video_util.h"
 #include "skia/ext/image_operations.h"
-#include "third_party/blink/public/platform/web_input_event.h"
-#include "third_party/blink/public/platform/web_screen_info.h"
-#include "third_party/blink/public/platform/web_touch_point.h"
+#include "third_party/blink/public/common/input/web_input_event.h"
+#include "third_party/blink/public/common/input/web_touch_point.h"
 #include "tizen/system_info.h"
 #include "ui/base/clipboard/clipboard_helper_efl.h"
 #include "ui/base/layout.h"
@@ -620,9 +617,16 @@ gfx::Rect RenderWidgetHostViewEfl::GetViewBounds() {
   return gfx::ConvertRectToDIP(device_scale_factor_, GetViewBoundsInPix());
 }
 
-bool RenderWidgetHostViewEfl::LockMouse() {
+blink::mojom::PointerLockResult RenderWidgetHostViewEfl::LockMouse(
+    bool request_unadjusted_movement) {
   NOTIMPLEMENTED();
-  return false;
+  return blink::mojom::PointerLockResult::kUnsupportedOptions;
+}
+
+blink::mojom::PointerLockResult RenderWidgetHostViewEfl::ChangeMouseLock(
+    bool request_unadjusted_movement) {
+  NOTIMPLEMENTED();
+  return blink::mojom::PointerLockResult::kUnsupportedOptions;
 }
 
 void RenderWidgetHostViewEfl::UnlockMouse() {
@@ -644,7 +648,7 @@ void RenderWidgetHostViewEfl::OnDidHandleKeyEvent(
   if (!im_context_)
     return;
 
-  if (input_event->GetType() == blink::WebInputEvent::kKeyDown)
+  if (input_event->GetType() == blink::WebInputEvent::Type::kKeyDown)
     im_context_->HandleKeyEvent(processed);
 }
 
@@ -719,7 +723,7 @@ void RenderWidgetHostViewEfl::UpdateBackgroundColorFromRenderer(SkColor color) {
 }
 
 void RenderWidgetHostViewEfl::TextInputStateChanged(
-    const TextInputState& params) {
+    const ui::mojom::TextInputState& params) {
   if (!params.show_ime_if_needed) {
     WebContentsImpl* wci = static_cast<WebContentsImpl*>(&web_contents_);
     WebContentsViewEfl* wcve = static_cast<WebContentsViewEfl*>(wci->GetView());
@@ -787,22 +791,6 @@ void RenderWidgetHostViewEfl::SelectionChanged(const base::string16& text,
   GetSelectionController()->UpdateSelectionData(selectedText);
 }
 
-void RenderWidgetHostViewEfl::SelectionBoundsChanged(
-    const WidgetHostMsg_SelectionBounds_Params& params) {
-  WidgetHostMsg_SelectionBounds_Params guest_params(params);
-  guest_params.anchor_rect =
-      ConvertRectToPixel(device_scale_factor_, params.anchor_rect);
-  guest_params.focus_rect =
-      ConvertRectToPixel(device_scale_factor_, params.focus_rect);
-
-  if (im_context_)
-    im_context_->UpdateCaretBounds(
-        gfx::UnionRects(guest_params.anchor_rect, guest_params.focus_rect));
-
-  if (GetSelectionController())
-    GetSelectionController()->SetIsAnchorFirst(guest_params.is_anchor_first);
-}
-
 void RenderWidgetHostViewEfl::DidStopFlinging() {
   EnsureEdgeEffect().Hide();
 
@@ -863,7 +851,7 @@ void RenderWidgetHostViewEfl::DisambiguationPopupDismissed() {
 void RenderWidgetHostViewEfl::HandleDisambiguationPopupMouseDownEvent(
     Evas_Event_Mouse_Down* evas_event) {
   blink::WebGestureEvent tap_down_event = MakeGestureEvent(
-      blink::WebInputEvent::kGestureTapDown, content_image_, evas_event);
+      blink::WebInputEvent::Type::kGestureTapDown, content_image_, evas_event);
   tap_down_event.data.tap.width = 0;
   tap_down_event.data.tap.tap_count = 1;
   SendGestureEvent(tap_down_event);
@@ -872,7 +860,7 @@ void RenderWidgetHostViewEfl::HandleDisambiguationPopupMouseDownEvent(
 void RenderWidgetHostViewEfl::HandleDisambiguationPopupMouseUpEvent(
     Evas_Event_Mouse_Up* evas_event) {
   blink::WebGestureEvent tap_event = MakeGestureEvent(
-      blink::WebInputEvent::kGestureTap, content_image_, evas_event);
+      blink::WebInputEvent::Type::kGestureTap, content_image_, evas_event);
   tap_event.data.tap.width = 0;
   tap_event.data.tap.tap_count = 1;
   SendGestureEvent(tap_event);
@@ -1084,7 +1072,7 @@ void RenderWidgetHostViewEfl::OnMouseDown(void* data,
 
   if (!rwhv->touch_events_enabled_) {
     blink::WebMouseEvent event =
-        MakeWebMouseEvent(blink::WebInputEvent::kMouseDown, obj,
+        MakeWebMouseEvent(blink::WebInputEvent::Type::kMouseDown, obj,
                           static_cast<Evas_Event_Mouse_Down*>(event_info));
     rwhv->host_->ForwardMouseEvent(event);
   } else {
@@ -1105,7 +1093,7 @@ void RenderWidgetHostViewEfl::OnMouseUp(void* data,
 
   if (!rwhv->touch_events_enabled_) {
     blink::WebMouseEvent event =
-        MakeWebMouseEvent(blink::WebInputEvent::kMouseUp, obj,
+        MakeWebMouseEvent(blink::WebInputEvent::Type::kMouseUp, obj,
                           static_cast<Evas_Event_Mouse_Up*>(event_info));
     rwhv->host_->ForwardMouseEvent(event);
   } else {
@@ -1352,9 +1340,10 @@ ui::LatencyInfo CreateLatencyInfo(const blink::WebInputEvent& event) {
 void RenderWidgetHostViewEfl::SendGestureEvent(blink::WebGestureEvent& event) {
   HandleGesture(event);
   blink::WebInputEvent::Type event_type = event.GetType();
-  if (magnifier_ && event_type == blink::WebInputEvent::kGestureScrollUpdate)
+  if (magnifier_ &&
+      event_type == blink::WebInputEvent::Type::kGestureScrollUpdate)
     return;
-  if (host_ && event_type != blink::WebInputEvent::kUndefined)
+  if (host_ && event_type != blink::WebInputEvent::Type::kUndefined)
     host_->ForwardGestureEventWithLatencyInfo(event, CreateLatencyInfo(event));
 }
 
@@ -1374,16 +1363,16 @@ void RenderWidgetHostViewEfl::HandleGesture(blink::WebGestureEvent& event) {
     controller->HandleGesture(event);
 
   blink::WebInputEvent::Type event_type = event.GetType();
-  if (event_type == blink::WebInputEvent::kGestureDoubleTap ||
-      event_type == blink::WebInputEvent::kGesturePinchBegin ||
-      event_type == blink::WebInputEvent::kGesturePinchEnd) {
+  if (event_type == blink::WebInputEvent::Type::kGestureDoubleTap ||
+      event_type == blink::WebInputEvent::Type::kGesturePinchBegin ||
+      event_type == blink::WebInputEvent::Type::kGesturePinchEnd) {
     WebContentsImpl* wci = static_cast<WebContentsImpl*>(&web_contents_);
     WebContentsViewEfl* wcve = static_cast<WebContentsViewEfl*>(wci->GetView());
     wcve->HandleZoomGesture(event);
   }
 
-  if ((event_type == blink::WebInputEvent::kGestureTap ||
-       event_type == blink::WebInputEvent::kGestureTapCancel) &&
+  if ((event_type == blink::WebInputEvent::Type::kGestureTap ||
+       event_type == blink::WebInputEvent::Type::kGestureTapCancel) &&
       !handling_disambiguation_popup_gesture_) {
     float size = 32.0f;  // Default value
 
@@ -1397,16 +1386,16 @@ void RenderWidgetHostViewEfl::HandleGesture(blink::WebGestureEvent& event) {
     event.data.tap.height = size;
   }
 
-  if (event_type == blink::WebInputEvent::kGestureTapDown) {
+  if (event_type == blink::WebInputEvent::Type::kGestureTapDown) {
     // Webkit does not stop a fling-scroll on tap-down. So explicitly send an
     // event to stop any in-progress flings.
     blink::WebGestureEvent fling_cancel = event;
-    fling_cancel.SetType(blink::WebInputEvent::kGestureFlingCancel);
+    fling_cancel.SetType(blink::WebInputEvent::Type::kGestureFlingCancel);
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
     fling_cancel.source_device = blink::kWebGestureDeviceTouchscreen;
 #endif
     SendGestureEvent(fling_cancel);
-  } else if (event_type == blink::WebInputEvent::kGestureScrollUpdate) {
+  } else if (event_type == blink::WebInputEvent::Type::kGestureScrollUpdate) {
     if (event.data.scroll_update.delta_x < 0)
       EnsureEdgeEffect().Hide("edge,left");
     else if (event.data.scroll_update.delta_x > 0)
@@ -1415,9 +1404,9 @@ void RenderWidgetHostViewEfl::HandleGesture(blink::WebGestureEvent& event) {
       EnsureEdgeEffect().Hide("edge,top");
     else if (event.data.scroll_update.delta_y > 0)
       EnsureEdgeEffect().Hide("edge,bottom");
-  } else if (event_type == blink::WebInputEvent::kGesturePinchBegin) {
+  } else if (event_type == blink::WebInputEvent::Type::kGesturePinchBegin) {
     EnsureEdgeEffect().Disable();
-  } else if (event_type == blink::WebInputEvent::kGesturePinchEnd) {
+  } else if (event_type == blink::WebInputEvent::Type::kGesturePinchEnd) {
     EnsureEdgeEffect().Enable();
   }
 }
@@ -1459,10 +1448,11 @@ void RenderWidgetHostViewEfl::HandleTouchEvent(ui::TouchEvent* event) {
 
 void RenderWidgetHostViewEfl::ProcessAckedTouchEvent(
     const TouchEventWithLatencyInfo& touch,
-    InputEventAckState ack_result) {
-  ui::EventResult result = (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED)
-                               ? ui::ER_HANDLED
-                               : ui::ER_UNHANDLED;
+    blink::mojom::InputEventResultState ack_result) {
+  ui::EventResult result =
+      (ack_result == blink::mojom::InputEventResultState::kConsumed)
+          ? ui::ER_HANDLED
+          : ui::ER_UNHANDLED;
   ui::GestureRecognizer::Gestures gestures = gesture_recognizer_->AckTouchEvent(
       touch.event.unique_touch_event_id, result,
       false /* is_source_touch_event_set_non_blocking */, this);
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
index 6dc4ad9..539933d 100644
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
@@ -95,7 +95,10 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl
   void Hide() override;
   bool IsShowing() override;
   gfx::Rect GetViewBounds() override;
-  bool LockMouse() override;
+  blink::mojom::PointerLockResult LockMouse(
+      bool request_unadjusted_movement) override;
+  blink::mojom::PointerLockResult ChangeMouseLock(
+      bool request_unadjusted_movement) override;
   void UnlockMouse() override;
   void Focus() override;
   bool HasFocus() override;
@@ -113,14 +116,12 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl
 
   void UpdateBackgroundColorFromRenderer(SkColor color);
 
-#if defined(EWK_BRINGUP)
   // [M51_2704] TextInputStateChanged() should be removed and its functionality
   //            should be moved/implemented in appropriate place based on
   //            upstream commit : https://codereview.chromium.org/1652483002,
   //            as it may introduce regression.
   // Updates the state of the input method attached to the view.
-  void TextInputStateChanged(const TextInputState& params);
-#endif
+  void TextInputStateChanged(const ui::mojom::TextInputState& params) override;
 
   void OnTextInputInFormStateChanged(bool is_in_form_tag);
 
@@ -135,10 +136,8 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl
   void SelectionChanged(const base::string16&,
                         size_t,
                         const gfx::Range&) override;
-  void SelectionBoundsChanged(
-      const WidgetHostMsg_SelectionBounds_Params&) override;
-  void SetWantsAnimateOnlyBeginFrames() override;
-  void SetNeedsBeginFrames(bool needs_begin_frames) override;
+  void SetWantsAnimateOnlyBeginFrames();
+  void SetNeedsBeginFrames(bool needs_begin_frames);
   void DidOverscroll(const ui::DidOverscrollParams& params) override;
   gfx::Rect GetBoundsInRootWindow() override;
   void RenderProcessGone() override;
@@ -146,8 +145,9 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl
 
   void OnFilteredMessageReceived(const IPC::Message&);
 
-  void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo&,
-                              InputEventAckState) override;
+  void ProcessAckedTouchEvent(
+      const TouchEventWithLatencyInfo& touch,
+      blink::mojom::InputEventResultState ack_result) override;
   std::unique_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget()
       override;
   void DidStopFlinging() override;
@@ -159,13 +159,12 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl
   void HandleDisambiguationPopupMouseUpEvent(Evas_Event_Mouse_Up*);
 
   void DidCreateNewRendererCompositorFrameSink(
-      viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink)
-      override;
+      viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink);
   void SubmitCompositorFrame(
       const viz::LocalSurfaceId& local_surface_id,
       viz::CompositorFrame frame,
-      base::Optional<viz::HitTestRegionList> hit_test_region_list) override;
-  void ClearCompositorFrame() override;
+      base::Optional<viz::HitTestRegionList> hit_test_region_list);
+  void ClearCompositorFrame();
   void ResetFallbackToFirstNavigationSurface() override;
 
   // ui::GestureEventHelper implementation.
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.cc
index 7a7ddf3..e84f50f 100644
--- a/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.cc
@@ -4,12 +4,13 @@
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/web_event_factory_efl.h"
-#include <unordered_map>
 
 #include <Ecore.h>
+#include <unordered_map>
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "third_party/blink/public/platform/web_common.h"
 #include "ui/display/screen.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/event_utils.h"
@@ -24,6 +25,7 @@ namespace {
 
 static const float kDefaultScrollStep = 20;
 
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
 static void TranslateEvasCoordToWebKitCoord(Evas_Object* web_view,
                                             blink::WebPoint* point) {
   Evas_Coord tmpX, tmpY;
@@ -31,6 +33,7 @@ static void TranslateEvasCoordToWebKitCoord(Evas_Object* web_view,
   point->x -= tmpX;
   point->y -= tmpY;
 }
+#endif
 
 float GetDeviceScaleFactor() {
   static float device_scale_factor = 0.0f;
@@ -381,6 +384,9 @@ template <class EVT>
 blink::WebMouseEvent MakeWebMouseEvent(WebInputEvent::Type type,
                                        Evas_Object* view,
                                        const EVT* ev) {
+#if defined(EWK_BRINGUP)  // FIXME: m85 bringup
+  return WebMouseEvent();
+#else
   const float sf = GetDeviceScaleFactor();
   blink::WebPoint point(ev->canvas.x / sf, ev->canvas.y / sf);
   TranslateEvasCoordToWebKitCoord(view, &point);
@@ -393,6 +399,7 @@ blink::WebMouseEvent MakeWebMouseEvent(WebInputEvent::Type type,
       ui::EventTimeStampFromSeconds(ev->timestamp / 1000));
 
   return event;
+#endif
 }
 
 template blink::WebMouseEvent MakeWebMouseEvent<Evas_Event_Mouse_Down>(
@@ -406,6 +413,9 @@ template blink::WebMouseEvent MakeWebMouseEvent<Evas_Event_Mouse_Up>(
 
 blink::WebMouseEvent MakeWebMouseEvent(Evas_Object* view,
                                        const Evas_Event_Mouse_Move* ev) {
+#if defined(EWK_BRINGUP)  // FIXME: m85 bringup
+  return WebMouseEvent();
+#else
   WebMouseEvent event(WebInputEvent::kMouseMove,
                       EvasToWebModifiers(ev->modifiers),
                       ui::EventTimeStampFromSeconds(ev->timestamp / 1000));
@@ -421,10 +431,14 @@ blink::WebMouseEvent MakeWebMouseEvent(Evas_Object* view,
   event.SetPositionInWidget(point.x, point.y);
 
   return event;
+#endif
 }
 
 blink::WebMouseWheelEvent MakeWebMouseEvent(Evas_Object* view,
                                             const Evas_Event_Mouse_Wheel* ev) {
+#if defined(EWK_BRINGUP)  // FIXME: m85 bringup
+  return WebMouseWheelEvent();
+#else
   WebMouseWheelEvent event(WebInputEvent::kMouseWheel,
                            EvasToWebModifiers(ev->modifiers),
                            ui::EventTimeStampFromSeconds(ev->timestamp / 1000));
@@ -447,12 +461,13 @@ blink::WebMouseWheelEvent MakeWebMouseEvent(Evas_Object* view,
   }
 
   return event;
+#endif
 }
 
 template <class EVT>
 NativeWebKeyboardEvent MakeWebKeyboardEvent(bool pressed, const EVT* evt) {
   NativeWebKeyboardEvent event(
-      pressed ? WebInputEvent::kKeyDown : WebInputEvent::kKeyUp,
+      pressed ? WebInputEvent::Type::kKeyDown : WebInputEvent::Type::kKeyUp,
       ModifiersFromEflKey(evt->key),
       ui::EventTimeStampFromSeconds(evt->timestamp / 1000));
 
@@ -465,10 +480,10 @@ NativeWebKeyboardEvent MakeWebKeyboardEvent(bool pressed, const EVT* evt) {
     event.unmodified_text[0] = CharacterFromEflString(evt->string);
   }
 
-  if (event.GetModifiers() & blink::WebInputEvent::kControlKey) {
-    event.text[0] = GetControlCharacter(
-        event.windows_key_code,
-        event.GetModifiers() & blink::WebInputEvent::kShiftKey);
+  if (event.GetModifiers() & WebInputEvent::kControlKey) {
+    event.text[0] =
+        GetControlCharacter(event.windows_key_code,
+                            event.GetModifiers() & WebInputEvent::kShiftKey);
   } else {
     event.text[0] = event.unmodified_text[0];
   }
@@ -513,11 +528,12 @@ ui::TouchEvent MakeTouchEvent(Evas_Coord_Point pt,
                               int id,
                               Evas_Object* view,
                               unsigned int timestamp) {
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   blink::WebPoint point(pt.x, pt.y);
   TranslateEvasCoordToWebKitCoord(view, &point);
   pt.x = point.x;
   pt.y = point.y;
-
+#endif
   const float scale = GetDeviceScaleFactor();
   base::TimeTicks event_timestamp = base::TimeTicks::FromInternalValue(
       timestamp * base::Time::kMicrosecondsPerMillisecond);
@@ -525,10 +541,9 @@ ui::TouchEvent MakeTouchEvent(Evas_Coord_Point pt,
   if (timestamp == 0)
     event_timestamp = ui::EventTimeForNow();
 
-  return ui::TouchEvent(
-      EvasTouchEventTypeToUI(state), gfx::Point(pt.x / scale, pt.y / scale),
-      event_timestamp,
-      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, id));
+  return ui::TouchEvent(EvasTouchEventTypeToUI(state),
+                        gfx::Point(pt.x / scale, pt.y / scale), event_timestamp,
+                        ui::PointerDetails(ui::EventPointerType::kTouch, id));
 }
 
 template WebGestureEvent MakeGestureEvent<Evas_Event_Mouse_Down>(
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.h
index 9303780..0de1187 100644
--- a/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.h
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.h
@@ -10,7 +10,7 @@
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/native_web_keyboard_event.h"
-#include "third_party/blink/public/platform/web_input_event.h"
+#include "third_party/blink/public/common/input/web_input_event.h"
 #include "ui/events/event.h"
 
 namespace content {
diff --git a/tizen_src/chromium_impl/content/browser/selection/selection_box_efl.h b/tizen_src/chromium_impl/content/browser/selection/selection_box_efl.h
index 9c8b18a..7337fc4 100644
--- a/tizen_src/chromium_impl/content/browser/selection/selection_box_efl.h
+++ b/tizen_src/chromium_impl/content/browser/selection/selection_box_efl.h
@@ -7,10 +7,10 @@
 
 #include <Evas.h>
 
-#include "content/public/common/context_menu_params.h"
+#include "content/public/browser/context_menu_params.h"
 #include "content/public/common/menu_item.h"
-#include "ui/gfx/range/range.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/range/range.h"
 
 class EWebView;
 
diff --git a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc
index 861a7b7..c966f88 100644
--- a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc
@@ -7,15 +7,15 @@
 #include <Edje.h>
 
 #include "base/trace_event/trace_event.h"
-#include "content/browser/renderer_host/render_widget_host_view_efl.h"
-#include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/browser/renderer_host/render_widget_host_impl.h"
+#include "content/browser/renderer_host/render_widget_host_view_efl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_contents_impl_efl.h"
 #include "content/common/view_messages.h"
-#include "content/public/browser/web_contents.h"
+#include "content/public/browser/context_menu_params.h"
 #include "content/public/browser/render_view_host.h"
-#include "content/public/common/context_menu_params.h"
+#include "content/public/browser/web_contents.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/dip_util.h"
 
@@ -31,7 +31,7 @@ bool IsRectEmpty(const gfx::Rect& rect) {
 
 gfx::Vector2dF ComputeLineOffsetFromBottom(const gfx::SelectionBound& bound) {
   gfx::Vector2dF line_offset =
-      gfx::ScaleVector2d(bound.edge_top() - bound.edge_bottom(), 0.5f);
+      gfx::ScaleVector2d(bound.edge_start() - bound.edge_end(), 0.5f);
   // An offset of 8 DIPs is sufficient for most line sizes. For small lines,
   // using half the line height avoids synthesizing a point on a line above
   // (or below) the intended line.
@@ -146,8 +146,10 @@ void SelectionControllerEfl::OnSelectionChanged(
   start_selection_ = start;
   end_selection_ = end;
 
-  gfx::Rect truncated_start(start.edge_top_rounded(), gfx::Size(0, start.GetHeight()));
-  gfx::Rect truncated_end(end.edge_top_rounded(), gfx::Size(0, end.GetHeight()));
+  gfx::Rect truncated_start(start.edge_start_rounded(),
+                            gfx::Size(0, start.GetHeight()));
+  gfx::Rect truncated_end(end.edge_start_rounded(),
+                          gfx::Size(0, end.GetHeight()));
 
   static float device_scale_factor =
       display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
@@ -524,11 +526,11 @@ void SelectionControllerEfl::HandleGesture(blink::WebGestureEvent& event) {
     long_mouse_press_ = true;
   }
 #endif
-  if (event_type == blink::WebInputEvent::kGestureScrollBegin ||
-      event_type == blink::WebInputEvent::kGesturePinchBegin) {
+  if (event_type == blink::WebInputEvent::Type::kGestureScrollBegin ||
+      event_type == blink::WebInputEvent::Type::kGesturePinchBegin) {
     SetControlsTemporarilyHidden(true);
-  } else if (event_type == blink::WebInputEvent::kGestureScrollEnd ||
-             event_type == blink::WebInputEvent::kGesturePinchEnd) {
+  } else if (event_type == blink::WebInputEvent::Type::kGestureScrollEnd ||
+             event_type == blink::WebInputEvent::Type::kGesturePinchEnd) {
     SetControlsTemporarilyHidden(false);
   }
 }
diff --git a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.h b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.h
index 1847407..d78a9f4 100644
--- a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.h
+++ b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.h
@@ -12,8 +12,8 @@
 #include "content/browser/selection/selection_handle_efl.h"
 #include "content/browser/selection/selection_magnifier_efl.h"
 #include "content/common/content_export.h"
-#include "third_party/blink/public/platform/web_gesture_event.h"
-#include "third_party/blink/public/platform/web_input_event.h"
+#include "third_party/blink/public/common/input/web_gesture_event.h"
+#include "third_party/blink/public/common/input/web_input_event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/range/range.h"
diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc
index a4c499b..a1ce240 100644
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc
@@ -11,7 +11,6 @@
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
-#include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/common/view_messages.h"
@@ -89,8 +88,9 @@ std::unique_ptr<WebContents> WebContentsImplEfl::Clone() {
   return nullptr;
 }
 
-void WebContentsImplEfl::SetUserAgentOverride(const std::string& override,
-                                              bool override_in_new_tabs) {}
+void WebContentsImplEfl::SetUserAgentOverride(
+    const blink::UserAgentOverride& ua_override,
+    bool override_in_new_tabs) {}
 
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
 // FIXME: EWK_BRINGUP definition should be removed.
@@ -196,12 +196,14 @@ void WebContentsImplEfl::CancelWindowRequest(int32_t render_process_id,
 #endif
   }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   if (ResourceDispatcherHostImpl::Get()) {
     ResourceDispatcherHostImpl::Get()->ResumeBlockedRequestsForRoute(
         GlobalFrameRoutingId(render_process_id, route_id));
     ResourceDispatcherHostImpl::Get()->ResumeBlockedRequestsForRoute(
         GlobalFrameRoutingId(render_process_id, main_frame_route_id));
   }
+#endif
 }
 
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h
index d7f342e..305f2dd 100644
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h
@@ -31,14 +31,13 @@ class CONTENT_EXPORT WebContentsImplEfl : public WebContentsImpl {
       SessionStorageNamespace* session_storage_namespace) override;
 #endif  // !defined(EWK_BRINGUP)
 
-  void* GetPlatformData() const { return platform_data_; };
+  void* GetPlatformData() const { return platform_data_; }
 
   void SetEflDelegate(WebContentsEflDelegate*);
 
   // Overrides for WebContents
   std::unique_ptr<WebContents> Clone() override;
-
-  void SetUserAgentOverride(const std::string& override,
+  void SetUserAgentOverride(const blink::UserAgentOverride& ua_override,
                             bool override_in_new_tabs) override;
 
  private:
diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc
index 5fc7fab..516c5cd4 100644
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc
@@ -18,7 +18,6 @@
 #include "content/browser/web_contents/web_drag_source_efl.h"
 #include "content/common/paths_efl.h"
 #include "content/common/view_messages.h"
-#include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents_view_delegate.h"
 #include "content/public/browser/web_contents_view_efl_delegate.h"
@@ -67,8 +66,7 @@ WebContentsViewEflDelegate* WebContentsViewEfl::GetEflDelegate() {
   return efl_delegate_.get();
 }
 
-void WebContentsViewEfl::CreateView(const gfx::Size& initial_size,
-                                    gfx::NativeView context) {
+void WebContentsViewEfl::CreateView(gfx::NativeView context) {
   Evas_Object* root_window = efl::WindowFactory::GetHostWindow(web_contents_);
 
   native_view_ = elm_layout_add(root_window);
@@ -87,8 +85,7 @@ void WebContentsViewEfl::CreateView(const gfx::Size& initial_size,
 }
 
 RenderWidgetHostViewBase* WebContentsViewEfl::CreateViewForWidget(
-    RenderWidgetHost* render_widget_host,
-    bool is_guest_view_hack) {
+    RenderWidgetHost* render_widget_host) {
   RenderWidgetHostViewEfl* view =
       new RenderWidgetHostViewEfl(render_widget_host, *web_contents_);
   view->InitAsChild(nullptr);
@@ -171,11 +168,12 @@ gfx::NativeWindow WebContentsViewEfl::GetTopLevelNativeWindow() const {
   return 0;
 }
 
-void WebContentsViewEfl::GetContainerBounds(gfx::Rect* out) const {
+gfx::Rect WebContentsViewEfl::GetContainerBounds() const {
   RenderWidgetHostViewEfl* view = static_cast<RenderWidgetHostViewEfl*>(
       web_contents_->GetRenderWidgetHostView());
   if (view)
-    *out = view->GetBoundsInRootWindow();
+    return view->GetBoundsInRootWindow();
+  return gfx::Rect();
 }
 
 void WebContentsViewEfl::SizeContents(const gfx::Size& size) {
@@ -185,10 +183,12 @@ void WebContentsViewEfl::SizeContents(const gfx::Size& size) {
 }
 
 void WebContentsViewEfl::Focus() {
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   if (web_contents_->GetInterstitialPage()) {
     web_contents_->GetInterstitialPage()->Focus();
     return;
   }
+#endif
 
   if (delegate_.get() && delegate_->Focus())
     return;
diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h
index d17983e..0c4745f 100644
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h
@@ -11,8 +11,8 @@
 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/common/content_export.h"
-#include "third_party/blink/public/platform/web_gesture_event.h"
-#include "third_party/blink/public/platform/web_input_event.h"
+#include "third_party/blink/public/common/input/web_gesture_event.h"
+#include "third_party/blink/public/common/input/web_input_event.h"
 
 namespace content {
 
@@ -36,13 +36,13 @@ class CONTENT_EXPORT WebContentsViewEfl
   WebContentsViewEflDelegate* GetEflDelegate();
 
   // content::WebContentsView implementation.
-  void CreateView(const gfx::Size&, gfx::NativeView context) override;
+  void CreateView(gfx::NativeView context) override;
   RenderWidgetHostViewBase* CreateViewForWidget(
-      RenderWidgetHost* render_widget_host, bool is_guest_view_hack) override;
+      RenderWidgetHost* render_widget_host) override;
   RenderWidgetHostViewBase* CreateViewForChildWidget(
       RenderWidgetHost* render_widget_host) override;
   void SetPageTitle(const base::string16& title) override;
-  void RenderViewCreated(RenderViewHost* host) override;
+  void RenderViewCreated(RenderViewHost* host);
   void RenderViewReady() override;
   void RenderViewHostChanged(RenderViewHost* old_host,
                              RenderViewHost* new_host) override;
@@ -50,8 +50,8 @@ class CONTENT_EXPORT WebContentsViewEfl
   gfx::NativeView GetNativeView() const override;
   gfx::NativeView GetContentNativeView() const override;
   gfx::NativeWindow GetTopLevelNativeWindow() const override;
-  void GetContainerBounds(gfx::Rect* out) const override;
-  void SizeContents(const gfx::Size& size) override;
+  gfx::Rect GetContainerBounds() const override;
+  void SizeContents(const gfx::Size& size);
   void Focus() override;
   void SetInitialFocus() override;
   void StoreFocus() override;
diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.h b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.h
index acf1c6e..7a92530 100644
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.h
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.h
@@ -9,7 +9,7 @@
 #include <Elementary.h>
 
 #include "content/public/common/drop_data.h"
-#include "third_party/blink/public/platform/web_drag_operation.h"
+#include "third_party/blink/public/common/page/web_drag_operation.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace content {
diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.cc
index d685314..6831c6c 100644
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.cc
@@ -84,11 +84,11 @@ bool WebDragSourceEfl::StartDragging(const DropData& drop_data,
   drop_data_.reset(new DropData(drop_data));
   initial_position_ = root_location;
 
-  if (!drop_data.text.string().empty())
+  if (drop_data.text && !drop_data.text->empty())
     targets_mask |= ELM_SEL_FORMAT_TEXT;
   if (drop_data.url.is_valid())
     targets_mask |= ELM_SEL_FORMAT_TEXT;
-  if (!drop_data.html.string().empty())
+  if (drop_data.html && !drop_data.html->empty())
     targets_mask |= ELM_SEL_FORMAT_HTML;
   if (!drop_data.file_contents.empty())
     targets_mask |= ELM_SEL_FORMAT_IMAGE;
diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.h b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.h
index 4e474dd..7a174a66 100644
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.h
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.h
@@ -10,7 +10,7 @@
 
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
-#include "third_party/blink/public/platform/web_drag_operation.h"
+#include "third_party/blink/public/common/page/web_drag_operation.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/vector2d.h"
diff --git a/tizen_src/chromium_impl/content/common/cursors/webcursor_efl.cc b/tizen_src/chromium_impl/content/common/cursors/webcursor_efl.cc
index e23323c..a155967 100644
--- a/tizen_src/chromium_impl/content/common/cursors/webcursor_efl.cc
+++ b/tizen_src/chromium_impl/content/common/cursors/webcursor_efl.cc
@@ -7,12 +7,12 @@
 #include "ecore_x_wayland_wrapper.h"
 
 #include "base/logging.h"
-#include "third_party/blink/public/platform/web_cursor_info.h"
-
-using namespace blink;
 
 #if defined(USE_WAYLAND)
 const char* GetCursorName(int type) {
+#if defined(EWK_BRINGUP)  // FIXME: m85 bringup
+  return "left_ptr";
+#else
   switch (type) {
     case WebCursorInfo::kTypePointer:
       return "left_ptr";
@@ -104,9 +104,13 @@ const char* GetCursorName(int type) {
   }
   NOTREACHED();
   return "left_ptr";
+#endif  // EWK_BRINGUP
 }
 #else
 int GetCursorType(int type) {
+#if defined(EWK_BRINGUP)  // FIXME: m85 bringup
+  return ECORE_X_CURSOR_XTERM;
+#else
   switch (type) {
     case WebCursorInfo::kTypePointer:
       return ECORE_X_CURSOR_ARROW;
@@ -195,5 +199,6 @@ int GetCursorType(int type) {
   }
   NOTREACHED();
   return ECORE_X_CURSOR_XTERM;
+#endif  // EWK_BRINGUP
 }
 #endif // defined(USE_WAYLAND)
diff --git a/tizen_src/chromium_impl/content/public/browser/web_contents_view_efl_delegate.h b/tizen_src/chromium_impl/content/public/browser/web_contents_view_efl_delegate.h
index 03c9a39..2c2a34a 100644
--- a/tizen_src/chromium_impl/content/public/browser/web_contents_view_efl_delegate.h
+++ b/tizen_src/chromium_impl/content/public/browser/web_contents_view_efl_delegate.h
@@ -8,11 +8,11 @@
 #include <vector>
 
 #include "content/common/content_export.h"
-#include "content/public/common/context_menu_params.h"
+#include "content/public/browser/context_menu_params.h"
 #include "content/public/common/menu_item.h"
+#include "third_party/blink/public/common/input/web_gesture_event.h"
+#include "third_party/blink/public/common/input/web_input_event.h"
 #include "third_party/blink/public/common/screen_orientation/web_screen_orientation_lock_type.h"
-#include "third_party/blink/public/platform/web_gesture_event.h"
-#include "third_party/blink/public/platform/web_input_event.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace content {
diff --git a/tizen_src/chromium_impl/content/shell/browser/shell_efl.cc b/tizen_src/chromium_impl/content/shell/browser/shell_efl.cc
index a7ebd9f..c1ad9e7 100644
--- a/tizen_src/chromium_impl/content/shell/browser/shell_efl.cc
+++ b/tizen_src/chromium_impl/content/shell/browser/shell_efl.cc
@@ -110,12 +110,14 @@ class Shell::Impl {
       elm_object_text_set(url_bar_, url);
   }
 
-  void ToggleControl(UIControl control, bool is_enabled) {
-    if (control == BACK_BUTTON && back_btn_) {
+  void ToggleControl(ShellPlatformDelegate::UIControl control,
+                     bool is_enabled) {
+    if (control == ShellPlatformDelegate::BACK_BUTTON && back_btn_) {
       elm_object_disabled_set(back_btn_, !is_enabled);
-    } else if (control == FORWARD_BUTTON && forward_btn_) {
+    } else if (control == ShellPlatformDelegate::FORWARD_BUTTON &&
+               forward_btn_) {
       elm_object_disabled_set(forward_btn_, !is_enabled);
-    } else if (control == STOP_BUTTON && stop_btn_) {
+    } else if (control == ShellPlatformDelegate::STOP_BUTTON && stop_btn_) {
       elm_object_disabled_set(stop_btn_, !is_enabled);
     }
   }
@@ -129,7 +131,8 @@ class Shell::Impl {
     Shell* shell = static_cast<Shell::Impl*>(data)->shell_;
     gfx::Size initial_size = Shell::GetShellDefaultSize();
     Shell::CreateNewWindow(shell->web_contents()->GetBrowserContext(),
-                           GURL("https://www.google.com"), NULL, initial_size);
+                           GURL("https://www.google.com"), nullptr,
+                           initial_size);
   }
 
   static void OnForward(void* data, Evas_Object*, void*) {
@@ -169,6 +172,7 @@ void OnShellWindowDelRequest(void* data, Evas_Object*, void*) {
 }
 }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
 // static
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
   elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
@@ -206,17 +210,18 @@ void Shell::PlatformSetContents() {
 
 void Shell::PlatformResizeSubViews() {}
 
+void Shell::PlatformSetTitle(const base::string16& title) {
+  elm_win_title_set(static_cast<Evas_Object*>(window_),
+                    base::UTF16ToUTF8(title).c_str());
+}
+#endif
+
 void Shell::Close() {
   LOG(INFO) << "Closing Content Shell EFL";
   delete impl_;
   delete this;
 }
 
-void Shell::PlatformSetTitle(const base::string16& title) {
-  elm_win_title_set(static_cast<Evas_Object*>(window_),
-                    base::UTF16ToUTF8(title).c_str());
-}
-
 JavaScriptDialogManager* Shell::GetJavaScriptDialogManager(
     WebContents* source) {
   if (!dialog_manager_) {
diff --git a/tizen_src/chromium_impl/content/shell/browser/shell_web_contents_view_delegate_efl.cc b/tizen_src/chromium_impl/content/shell/browser/shell_web_contents_view_delegate_efl.cc
index 98b829f..7cc6a02 100644
--- a/tizen_src/chromium_impl/content/shell/browser/shell_web_contents_view_delegate_efl.cc
+++ b/tizen_src/chromium_impl/content/shell/browser/shell_web_contents_view_delegate_efl.cc
@@ -15,9 +15,10 @@
 #include "content/shell/browser/shell_content_browser_client.h"
 #include "content/shell/browser/shell_devtools_frontend.h"
 #include "content/shell/common/shell_switches.h"
+#include "third_party/blink/public/common/context_menu_data/edit_flags.h"
 #include "third_party/blink/public/web/web_context_menu_data.h"
 
-using blink::WebContextMenuData;
+using blink::ContextMenuDataEditFlags;
 
 namespace content {
 
@@ -29,7 +30,8 @@ void OpenInNewWindow(void* data, Evas_Object*, void*) {
   const ContextMenuParams* params = static_cast<const ContextMenuParams*>(data);
   ShellBrowserContext* browser_context =
       ShellContentBrowserClient::Get()->browser_context();
-  Shell::CreateNewWindow(browser_context, params->link_url, NULL, gfx::Size());
+  Shell::CreateNewWindow(browser_context, params->link_url, nullptr,
+                         gfx::Size());
 }
 
 void StartDragging(void* data, Evas_Object*, void*) {
@@ -126,18 +128,21 @@ void ShellWebContentsViewDelegate::ShowContextMenu(
   if (params_.is_editable) {
     menu_it = elm_menu_item_add(menu, NULL, NULL, "Cut", Cut, web_contents_);
     elm_object_item_disabled_set(
-        menu_it, (params_.edit_flags & WebContextMenuData::kCanCut) == 0);
+        menu_it, (params_.edit_flags & ContextMenuDataEditFlags::kCanCut) == 0);
     menu_it = elm_menu_item_add(menu, NULL, NULL, "Copy", Copy, web_contents_);
     elm_object_item_disabled_set(
-        menu_it, (params_.edit_flags & WebContextMenuData::kCanCopy) == 0);
+        menu_it,
+        (params_.edit_flags & ContextMenuDataEditFlags::kCanCopy) == 0);
     menu_it =
         elm_menu_item_add(menu, NULL, NULL, "Paste", Paste, web_contents_);
     elm_object_item_disabled_set(
-        menu_it, (params_.edit_flags & WebContextMenuData::kCanPaste) == 0);
+        menu_it,
+        (params_.edit_flags & ContextMenuDataEditFlags::kCanPaste) == 0);
     menu_it = elm_menu_item_add(menu, NULL, "delete", "Delete", Delete,
                                 web_contents_);
     elm_object_item_disabled_set(
-        menu_it, (params_.edit_flags & WebContextMenuData::kCanDelete) == 0);
+        menu_it,
+        (params_.edit_flags & ContextMenuDataEditFlags::kCanDelete) == 0);
     elm_menu_item_separator_add(menu, NULL);
   }
 
diff --git a/tizen_src/chromium_impl/efl/init.cc b/tizen_src/chromium_impl/efl/init.cc
index 2bdfa61..3113b7a 100644
--- a/tizen_src/chromium_impl/efl/init.cc
+++ b/tizen_src/chromium_impl/efl/init.cc
@@ -9,7 +9,6 @@
 #include "ecore_x_wayland_wrapper.h"
 
 #include "base/logging.h"
-#include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_pump_ecore.h"
 #include "cc/base/switches.h"
 #include "chromium_impl/build/tizen_version.h"
diff --git a/tizen_src/chromium_impl/efl/window_factory.cc b/tizen_src/chromium_impl/efl/window_factory.cc
index e6de039..3009409 100644
--- a/tizen_src/chromium_impl/efl/window_factory.cc
+++ b/tizen_src/chromium_impl/efl/window_factory.cc
@@ -6,6 +6,7 @@
 
 #include <Elementary.h>
 
+#include "base/check.h"
 #include "base/logging.h"
 
 using content::WebContents;
diff --git a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc
index ced0a1c..33fb71a 100644
--- a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc
+++ b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc
@@ -71,8 +71,18 @@ unsigned int GLES2ImplementationEfl::GetTransferBufferFreeSize() const {
   return 0;
 }
 
+bool GLES2ImplementationEfl::IsJpegDecodeAccelerationSupported() const {
+  NOTREACHED();
+  return false;
+}
+
+bool GLES2ImplementationEfl::IsWebPDecodeAccelerationSupported() const {
+  NOTREACHED();
+  return false;
+}
+
 bool GLES2ImplementationEfl::CanDecodeWithHardwareAcceleration(
-    base::span<const uint8_t> encoded_data) const {
+    const cc::ImageHeaderMetadata* image_metadata) const {
   NOTREACHED();
   return false;
 }
diff --git a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h
index e41f46b..f43784b 100644
--- a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h
+++ b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h
@@ -79,13 +79,16 @@ class GLES2_IMPL_EXPORT GLES2ImplementationEfl : public ContextSupport,
   void DeleteTransferCacheEntry(uint32_t entry_type,
                                 uint32_t entry_id) override {}
   unsigned int GetTransferBufferFreeSize() const override;
+  bool IsJpegDecodeAccelerationSupported() const override;
+  bool IsWebPDecodeAccelerationSupported() const override;
   bool CanDecodeWithHardwareAcceleration(
-      base::span<const uint8_t> encoded_data) const override;
+      const cc::ImageHeaderMetadata* image_metadata) const override;
   bool HasGrContextSupport() const override;
   void SetGrContext(GrContext* gr) override {}
   void WillCallGLFromSkia() override {}
   void DidCallGLFromSkia() override {}
   void SetDisplayTransform(gfx::OverlayTransform transform) override {}
+  void SetFrameRate(float frame_rate) override {}
 
   // InterfaceBase implementation.
   void GenSyncTokenCHROMIUM(GLbyte* sync_token) override {}
diff --git a/tizen_src/chromium_impl/gpu/command_buffer/client/shared_mailbox_manager.cc b/tizen_src/chromium_impl/gpu/command_buffer/client/shared_mailbox_manager.cc
index a006242..e270680 100644
--- a/tizen_src/chromium_impl/gpu/command_buffer/client/shared_mailbox_manager.cc
+++ b/tizen_src/chromium_impl/gpu/command_buffer/client/shared_mailbox_manager.cc
@@ -4,7 +4,7 @@
 
 #include "shared_mailbox_manager.h"
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 
 static gpu::MailboxManager* mailbox_manager_;
diff --git a/tizen_src/chromium_impl/ui/BUILD.gn b/tizen_src/chromium_impl/ui/BUILD.gn
index d317980..59644a8 100644
--- a/tizen_src/chromium_impl/ui/BUILD.gn
+++ b/tizen_src/chromium_impl/ui/BUILD.gn
@@ -14,6 +14,7 @@ static_library("ui_events_source_inject") {
     "//ui/events/gestures/motion_event_aura.h",
   ]
   include_dirs = [ "//third_party/skia" ]
+  deps = [ "//third_party/perfetto/protos/perfetto/trace/track_event:zero" ]
 }
 
 static_library("ui_native_theme_inject") {
@@ -32,7 +33,5 @@ static_library("ui_base_inject") {
     #"//ui/base/cursor/cursors_aura.h",
     #"//ui/base/cursor/cursors_aura.cc",
   ]
-  deps = [
-    "//skia",
-  ]
+  deps = [ "//skia" ]
 }
diff --git a/tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.h b/tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.h
index 590982f..8eaa62d 100644
--- a/tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.h
+++ b/tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.h
@@ -10,7 +10,6 @@
 #include "ecore_x_wayland_wrapper.h"
 
 #include "base/memory/singleton.h"
-#include "ui/base/ui_base_export.h"
 
 // This class is based on ClipboardHelper class in WK2/Tizen.
 // Coding Style has been changed as per Chromium coding style.
@@ -21,7 +20,7 @@
 // There are a few magic strings in implementation.
 class EWebView;
 template <typename T> struct DefaultSingletonTraits;
-class UI_BASE_EXPORT ClipboardHelperEfl {
+class ClipboardHelperEfl {
  public:
   enum ClipboardDataType {
     CLIPBOARD_DATA_TYPE_PLAIN_TEXT,
diff --git a/tizen_src/chromium_impl/ui/display/screen_efl.cc b/tizen_src/chromium_impl/ui/display/screen_efl.cc
index 0d74f4d..2e9bd6c 100644
--- a/tizen_src/chromium_impl/ui/display/screen_efl.cc
+++ b/tizen_src/chromium_impl/ui/display/screen_efl.cc
@@ -7,14 +7,12 @@
 #include "ecore_x_wayland_wrapper.h"
 
 #include "content/browser/renderer_host/dip_util.h"
-#include "ui/base/x/x11_util.h"
 #include "ui/display/device_display_info_efl.h"
 #include "ui/display/display.h"
 #include "ui/display/display_observer.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/x/x11_types.h"
 
 using namespace display;
 
@@ -38,7 +36,13 @@ class ScreenEfl : public display::Screen {
   }
 
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override {
-    return NULL;
+    return nullptr;
+  }
+
+  gfx::NativeWindow GetLocalProcessWindowAtPoint(
+      const gfx::Point& point,
+      const std::set<gfx::NativeWindow>& ignore) override {
+    return nullptr;
   }
 
   int GetNumDisplays() const override { return 1; }
diff --git a/tizen_src/chromium_impl/ui/gl/gl_shared_context_efl.cc b/tizen_src/chromium_impl/ui/gl/gl_shared_context_efl.cc
index 0ec7559..ad3a35f 100644
--- a/tizen_src/chromium_impl/ui/gl/gl_shared_context_efl.cc
+++ b/tizen_src/chromium_impl/ui/gl/gl_shared_context_efl.cc
@@ -8,6 +8,7 @@
 #include <Ecore_Evas.h>
 #include <Evas_GL.h>
 
+#include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "gpu/command_buffer/service/mailbox_manager_impl.h"
 #include "ui/gl/gl_context.h"
@@ -63,7 +64,7 @@ struct GLSharedContextEflPrivate : public gl::GLContext {
   void* GetHandle() override { return handle_; }
 
   scoped_refptr<gl::GPUTimingClient> CreateGPUTimingClient() override {
-    return 0;
+    return nullptr;
   }
 
   const gfx::ExtensionSet& GetExtensions() override {
diff --git a/tizen_src/chromium_impl/ui/ozone/ozone_platform_efl.cc b/tizen_src/chromium_impl/ui/ozone/ozone_platform_efl.cc
index 122adef..0fbb670 100644
--- a/tizen_src/chromium_impl/ui/ozone/ozone_platform_efl.cc
+++ b/tizen_src/chromium_impl/ui/ozone/ozone_platform_efl.cc
@@ -4,10 +4,12 @@
 
 #include "ui/ozone/ozone_platform_efl.h"
 
+#include "ui/base/ime/input_method.h"
 #include "ui/display/types/native_display_delegate.h"
-#include "ui/events/system_input_injector.h"
 #include "ui/ozone/public/gpu_platform_support_host.h"
 #include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/public/platform_screen.h"
+#include "ui/ozone/public/system_input_injector.h"
 #include "ui/ozone/surface_factory_efl.h"
 #include "ui/platform_window/platform_window.h"
 #include "ui/platform_window/platform_window_init_properties.h"
@@ -19,20 +21,21 @@ namespace {
 // OzonePlatform implementation for EFL.
 class OzonePlatformEfl : public OzonePlatform {
  public:
-  OzonePlatformEfl() {}
-  ~OzonePlatformEfl() override {}
+  OzonePlatformEfl() = default;
+  ~OzonePlatformEfl() override = default;
 
-  ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() override {
+  // OzonePlatform:
+  SurfaceFactoryOzone* GetSurfaceFactoryOzone() override {
     return surface_factory_.get();
   }
 
-  ui::OverlayManagerOzone* GetOverlayManager() override { return nullptr; }
+  OverlayManagerOzone* GetOverlayManager() override { return nullptr; }
 
-  ui::CursorFactoryOzone* GetCursorFactoryOzone() override { return nullptr; }
+  CursorFactory* GetCursorFactory() override { return nullptr; }
 
-  ui::InputController* GetInputController() override { return nullptr; }
+  InputController* GetInputController() override { return nullptr; }
 
-  ui::GpuPlatformSupportHost* GetGpuPlatformSupportHost() override {
+  GpuPlatformSupportHost* GetGpuPlatformSupportHost() override {
     return gpu_platform_host_.get();
   }
 
@@ -51,6 +54,14 @@ class OzonePlatformEfl : public OzonePlatform {
     return nullptr;
   }
 
+  std::unique_ptr<InputMethod> CreateInputMethod(
+      internal::InputMethodDelegate* delegate,
+      gfx::AcceleratedWidget widget) override {
+    return nullptr;
+  }
+
+  std::unique_ptr<PlatformScreen> CreateScreen() override { return nullptr; }
+
  private:
   void InitializeUI(const InitParams& /*params*/) override {
     gpu_platform_host_.reset(CreateStubGpuPlatformSupportHost());
diff --git a/tizen_src/chromium_impl/ui/ozone/surface_factory_efl.cc b/tizen_src/chromium_impl/ui/ozone/surface_factory_efl.cc
index 1e0bf95..0d64500 100644
--- a/tizen_src/chromium_impl/ui/ozone/surface_factory_efl.cc
+++ b/tizen_src/chromium_impl/ui/ozone/surface_factory_efl.cc
@@ -37,16 +37,19 @@ class GLOzoneEGLEfl : public GLOzoneEGL {
   }
 
  protected:
-  intptr_t GetNativeDisplay() override {
+  gl::EGLDisplayPlatform GetNativeDisplay() override {
 #if defined(USE_WAYLAND)
 #if TIZEN_VERSION_AT_LEAST(5, 0, 0)
     Ecore_Wl2_Display* wl2_display = ecore_wl2_connected_display_get(NULL);
-    return reinterpret_cast<intptr_t>(ecore_wl2_display_get(wl2_display));
+    return gl::EGLDisplayPlatform(reinterpret_cast<EGLNativeDisplayType>(
+        ecore_wl2_display_get(wl2_display)));
 #else
-    return reinterpret_cast<intptr_t>(ecore_wl_display_get());
+    return gl::EGLDisplayPlatform(
+        reinterpret_cast<EGLNativeDisplayType>(ecore_wl_display_get()));
 #endif  // TIZEN_VERSION_AT_LEAST(5, 0, 0)
 #else
-    return reinterpret_cast<intptr_t>(ecore_x_display_get());
+    return gl::EGLDisplayPlatform(
+        reinterpret_cast<EGLNativeDisplayType>(ecore_x_display_get()));
 #endif
   }
 
diff --git a/tizen_src/chromium_impl/ui/snapshot/snapshot_efl.cc b/tizen_src/chromium_impl/ui/snapshot/snapshot_efl.cc
index c626fa2..f9d183e 100644
--- a/tizen_src/chromium_impl/ui/snapshot/snapshot_efl.cc
+++ b/tizen_src/chromium_impl/ui/snapshot/snapshot_efl.cc
@@ -31,14 +31,14 @@ bool GrabWindowSnapshot(gfx::NativeWindow window,
 
 void GrabWindowSnapshotAsync(gfx::NativeWindow window,
                              const gfx::Rect& source_rect,
-                             const GrabWindowSnapshotAsyncCallback& callback) {
+                             GrabWindowSnapshotAsyncCallback callback) {
   NOTIMPLEMENTED();
 }
 
 void GrabViewSnapshotAsync(gfx::NativeView view,
                            const gfx::Rect& source_rect,
-                           const GrabWindowSnapshotAsyncCallback& callback) {
-  GrabWindowSnapshotAsync(view, source_rect, callback);
+                           GrabWindowSnapshotAsyncCallback callback) {
+  GrabWindowSnapshotAsync(view, source_rect, std::move(callback));
 }
 
 }  // namespace ui
diff --git a/tizen_src/ewk/efl_integration/BUILD.gn b/tizen_src/ewk/efl_integration/BUILD.gn
index 55ed7c4..b76a98d 100644
--- a/tizen_src/ewk/efl_integration/BUILD.gn
+++ b/tizen_src/ewk/efl_integration/BUILD.gn
@@ -202,8 +202,6 @@ shared_library("chromium-ewk") {
     "browser/quota_permission_context_efl.h",
     "browser/render_message_filter_efl.cc",
     "browser/render_message_filter_efl.h",
-    "browser/resource_dispatcher_host_delegate_efl.cc",
-    "browser/resource_dispatcher_host_delegate_efl.h",
     "browser/resource_throttle_efl.cc",
     "browser/resource_throttle_efl.h",
     "browser/scoped_allow_wait_for_legacy_web_view_api.h",
@@ -533,8 +531,6 @@ shared_library("chromium-ewk") {
     "wrt/v8widget.h",
     "wrt/wrt_dynamicplugin.cc",
     "wrt/wrt_dynamicplugin.h",
-    "wrt/wrt_file_protocol_handler.cc",
-    "wrt/wrt_file_protocol_handler.h",
     "wrt/wrt_widget_host.cc",
     "wrt/wrt_widget_host.h",
     "wrt/wrtwidget.cc",
@@ -544,11 +540,15 @@ shared_library("chromium-ewk") {
   # FIXME: ewk_bringup definition should be removed.
   if (!ewk_bringup) {
     sources += [
+      "browser/resource_dispatcher_host_delegate_efl.cc",
+      "browser/resource_dispatcher_host_delegate_efl.h",
       "chromium_ewk.gypi",
       "file_chooser_controller_efl.cc",
       "file_chooser_controller_efl.h",
       "renderer/plugins/plugin_placeholder_efl.cc",
       "renderer/plugins/plugin_placeholder_efl.h",
+      "wrt/wrt_file_protocol_handler.cc",
+      "wrt/wrt_file_protocol_handler.h",
     ]
   }
 
diff --git a/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc
index 1d141c9..af016e3 100644
--- a/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc
@@ -42,13 +42,14 @@ BrowsingDataRemoverEfl* BrowsingDataRemoverEfl::CreateForRange(content::BrowserC
 
 int BrowsingDataRemoverEfl::GenerateQuotaClientMask(int remove_mask) {
   int quota_client_mask = 0;
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   if (remove_mask & BrowsingDataRemoverEfl::REMOVE_FILE_SYSTEMS)
     quota_client_mask |= storage::QuotaClient::kFileSystem;
   if (remove_mask & BrowsingDataRemoverEfl::REMOVE_WEBSQL)
     quota_client_mask |= storage::QuotaClient::kDatabase;
   if (remove_mask & BrowsingDataRemoverEfl::REMOVE_INDEXEDDB)
     quota_client_mask |= storage::QuotaClient::kIndexedDatabase;
-
+#endif
   return quota_client_mask;
 }
 
@@ -74,9 +75,11 @@ BrowsingDataRemoverEfl::BrowsingDataRemoverEfl(
       remove_mask_(0) {
   if (browser_context_) {
     app_cache_service_ = browser_context->GetStoragePartition(browser_context_, NULL)->GetAppCacheService();
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
     main_context_getter_ =
       content::BrowserContext::GetDefaultStoragePartition(browser_context_)->GetURLRequestContext();
     media_context_getter_ = browser_context->CreateMediaRequestContext();
+#endif
   }
 }
 
@@ -88,7 +91,7 @@ void BrowsingDataRemoverEfl::ClearNetworkCache() {
   waiting_for_clear_cache_ = true;
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::Bind(&BrowsingDataRemoverEfl::ClearNetworkCacheOnIOThread,
                  base::Unretained(this)));
@@ -170,10 +173,9 @@ void BrowsingDataRemoverEfl::DoClearCache(int rv)  {
         next_cache_state_ = STATE_NONE;
 
         // Notify the UI thread that we are done.
-        base::PostTaskWithTraits(
-            FROM_HERE, {BrowserThread::UI},
-            base::Bind(&BrowsingDataRemoverEfl::ClearedCache,
-                       base::Unretained(this)));
+        base::PostTask(FROM_HERE, {BrowserThread::UI},
+                       base::Bind(&BrowsingDataRemoverEfl::ClearedCache,
+                                  base::Unretained(this)));
         return;
       }
       default: {
@@ -241,7 +243,7 @@ void BrowsingDataRemoverEfl::RemoveImpl(int remove_mask,
       quota_manager_ = content::BrowserContext::GetStoragePartition(browser_context_, NULL)->GetQuotaManager();
     }
     waiting_for_clear_quota_managed_data_ = true;
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::Bind(&BrowsingDataRemoverEfl::ClearQuotaManagedDataOnIOThread,
                    base::Unretained(this)));
@@ -270,10 +272,9 @@ void BrowsingDataRemoverEfl::DeleteAppCachesForOrigin(
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     // TODO: Using base::Unretained is not thread safe
     // It may happen that on IO thread this ptr will be already deleted
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::IO},
-        base::Bind(&BrowsingDataRemoverEfl::DeleteAppCachesForOrigin,
-                   base::Unretained(this), origin));
+    base::PostTask(FROM_HERE, {BrowserThread::IO},
+                   base::Bind(&BrowsingDataRemoverEfl::DeleteAppCachesForOrigin,
+                              base::Unretained(this), origin));
     return;
   }
 
@@ -383,10 +384,9 @@ void BrowsingDataRemoverEfl::CheckQuotaManagedDataDeletionStatus() {
       quota_managed_origins_to_delete_count_ != 0)
   return;
 
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
-      base::Bind(&BrowsingDataRemoverEfl::OnQuotaManagedDataDeleted,
-                 base::Unretained(this)));
+  base::PostTask(FROM_HERE, {BrowserThread::UI},
+                 base::Bind(&BrowsingDataRemoverEfl::OnQuotaManagedDataDeleted,
+                            base::Unretained(this)));
 }
 
 void BrowsingDataRemoverEfl::OnQuotaManagedDataDeleted() {
diff --git a/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc
index 0929680..f0b873b 100644
--- a/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc
@@ -51,41 +51,42 @@ base::FilePath DownloadManagerDelegateEfl::GetPlatformDownloadPath(
   return path.Append(item->GetSuggestedFilename());
 }
 
-void DownloadManagerDelegateEfl::CancelDownload(
-    const content::DownloadTargetCallback& callback) const {
-  callback.Run(base::FilePath(), /* Empty file path for cancellation */
-               download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-               download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, base::FilePath(),
-               download::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED);
-}
-
 bool DownloadManagerDelegateEfl::DetermineDownloadTarget(
     download::DownloadItem* item,
-    const content::DownloadTargetCallback& callback) {
+    content::DownloadTargetCallback* callback) {
   if (TriggerExternalDownloadManager(item)) {
-    CancelDownload(callback);
+    std::move(*callback).Run(
+        base::FilePath(), /* Empty file path for cancellation */
+        download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
+        download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
+        download::DownloadItem::MixedContentStatus::UNKNOWN, base::FilePath(),
+        base::nullopt /*download_schedule*/,
+        download::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED);
   } else {
-    callback.Run(GetPlatformDownloadPath(item),
-                 download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-                 download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-                 GetPlatformDownloadPath(item),
-                 download::DOWNLOAD_INTERRUPT_REASON_NONE);
+    std::move(*callback).Run(
+        GetPlatformDownloadPath(item),
+        download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
+        download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
+        download::DownloadItem::MixedContentStatus::UNKNOWN,
+        GetPlatformDownloadPath(item), base::nullopt /*download_schedule*/,
+        download::DOWNLOAD_INTERRUPT_REASON_NONE);
   }
   return true;
 }
 
 bool DownloadManagerDelegateEfl::ShouldCompleteDownload(download::DownloadItem*,
-                                                        const base::Closure&) {
+                                                        base::OnceClosure) {
   return true;
 }
 
 bool DownloadManagerDelegateEfl::ShouldOpenDownload(
     download::DownloadItem*,
-    const content::DownloadOpenDelayedCallback&) {
+    content::DownloadOpenDelayedCallback) {
   return true;
 }
 
-void DownloadManagerDelegateEfl::GetNextId(const content::DownloadIdCallback& callback) {
+void DownloadManagerDelegateEfl::GetNextId(
+    content::DownloadIdCallback callback) {
   static uint32_t next_id = download::DownloadItem::kInvalidId + 1;
-  callback.Run(next_id++);
+  std::move(callback).Run(next_id++);
 }
diff --git a/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h
index 3adbf1a..bcf99cd 100644
--- a/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h
@@ -10,26 +10,23 @@
 // This is the EFL side helper for the download system.
 class DownloadManagerDelegateEfl : public content::DownloadManagerDelegate {
 public:
-    virtual ~DownloadManagerDelegateEfl() { }
+ ~DownloadManagerDelegateEfl() override = default;
+
+ // content::DownloadManagerDelegate implementation.
+ bool DetermineDownloadTarget(download::DownloadItem*,
+                              content::DownloadTargetCallback*) override;
+ bool ShouldCompleteDownload(download::DownloadItem*,
+                             base::OnceClosure) override;
+ bool ShouldOpenDownload(download::DownloadItem*,
+                         content::DownloadOpenDelayedCallback) override;
+ void GetNextId(content::DownloadIdCallback) override;
 
-    // content::DownloadManagerDelegate implementation.
-    virtual bool DetermineDownloadTarget(
-        download::DownloadItem*,
-        const content::DownloadTargetCallback&) override;
-    virtual bool ShouldCompleteDownload(download::DownloadItem*,
-                                        const base::Closure&) override;
-    virtual bool ShouldOpenDownload(
-        download::DownloadItem*,
-        const content::DownloadOpenDelayedCallback&) override;
-    virtual void GetNextId(const content::DownloadIdCallback&) override;
 private:
     // If the external download manager is available, trigger download
     // with it and return true, otherwise return false.
  bool TriggerExternalDownloadManager(download::DownloadItem* item) const;
 
  base::FilePath GetPlatformDownloadPath(download::DownloadItem* item) const;
-
- void CancelDownload(const content::DownloadTargetCallback&) const;
 };
 
 #endif // DOWNLOAD_MANAGER_DELEGATE_EFL_H
diff --git a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc
index afd7bb7..4bbb25e 100644
--- a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc
+++ b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc
@@ -215,8 +215,7 @@ void FaviconDatabase::SyncSQLite() {
           content::BrowserThread::DB);
 #else
   scoped_refptr<base::SingleThreadTaskRunner> ptr =
-      base::CreateSingleThreadTaskRunnerWithTraits(
-          {content::BrowserThread::UI});
+      base::CreateSingleThreadTaskRunner({content::BrowserThread::UI});
 #endif
   ptr->PostTask(FROM_HERE, base::Bind(&FaviconDatabasePrivate::performSync, d->weakPtrFactory.GetWeakPtr()));
 }
diff --git a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc
index d2556ae..7208a06 100644
--- a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc
+++ b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc
@@ -51,8 +51,7 @@ scoped_refptr<base::SingleThreadTaskRunner> FaviconDatabasePrivate::taskRunner()
   return content::BrowserThread::GetTaskRunnerForThread(
       content::BrowserThread::DB);
 #else
-  return base::CreateSingleThreadTaskRunnerWithTraits(
-      {content::BrowserThread::UI});
+  return base::CreateSingleThreadTaskRunner({content::BrowserThread::UI});
 #endif
 }
 
diff --git a/tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.cc b/tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.cc
index 25773dd..786c443 100644
--- a/tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.cc
+++ b/tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.cc
@@ -21,12 +21,13 @@ void FaviconDownloader::Start() {
 }
 
 int FaviconDownloader::DownloadFavicon(const GURL &faviconUrl) {
-  return web_contents()->DownloadImage(faviconUrl,
-                                       true,  /* bool is_favicon */
-                                       0,     /* uint32_t max_bitmap_size */
-                                       false, /* bool bypass_cache */
-                                       base::Bind(&FaviconDownloader::DidDownloadFavicon,
-                                                  m_weakPtrFactory.GetWeakPtr()));
+  return web_contents()->DownloadImage(
+      faviconUrl, true, /* bool is_favicon */
+      0,                /* uint32_t preferred_size */
+      0,                /* uint32_t max_bitmap_size */
+      false,            /* bool bypass_cache */
+      base::Bind(&FaviconDownloader::DidDownloadFavicon,
+                 m_weakPtrFactory.GetWeakPtr()));
 }
 
 void FaviconDownloader::DidDownloadFavicon(int id,
diff --git a/tizen_src/ewk/efl_integration/browser/login_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/login_delegate_efl.cc
index f079ed0..1be7566 100644
--- a/tizen_src/ewk/efl_integration/browser/login_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/login_delegate_efl.cc
@@ -9,8 +9,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_frame_host.h"
-#include "content/public/browser/resource_dispatcher_host.h"
-#include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/auth.h"
 #include "net/url_request/url_request.h"
@@ -21,8 +19,6 @@
 using content::BrowserThread;
 using content::RenderViewHost;
 using content::RenderFrameHost;
-using content::ResourceDispatcherHost;
-using content::ResourceRequestInfo;
 using content::WebContents;
 
 LoginDelegateEfl::LoginDelegateEfl(net::AuthChallengeInfo* auth_info, net::URLRequest* request)
@@ -30,13 +26,15 @@ LoginDelegateEfl::LoginDelegateEfl(net::AuthChallengeInfo* auth_info, net::URLRe
       request_(request),
       render_process_id_(-1),
       render_frame_id_(-1) {
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   bool result = ResourceRequestInfo::GetRenderFrameForRequest(request, &render_process_id_, &render_frame_id_);
 
   DCHECK(result);
   DCHECK(render_process_id_ != -1);
   DCHECK(render_frame_id_ != -1);
+#endif
 
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(&LoginDelegateEfl::HandleHttpAuthRequestOnUIThread,
                      base::Unretained(this)));
@@ -47,18 +45,17 @@ LoginDelegateEfl::~LoginDelegateEfl() {
 
 void LoginDelegateEfl::Proceed(const char* user, const char* password) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::BindOnce(&LoginDelegateEfl::ProceedOnIOThread,
-                     base::Unretained(this), base::UTF8ToUTF16(user),
-                     base::UTF8ToUTF16(password)));
+  base::PostTask(FROM_HERE, {BrowserThread::IO},
+                 base::BindOnce(&LoginDelegateEfl::ProceedOnIOThread,
+                                base::Unretained(this), base::UTF8ToUTF16(user),
+                                base::UTF8ToUTF16(password)));
 }
 
 void LoginDelegateEfl::Cancel() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::IO},
-                           base::BindOnce(&LoginDelegateEfl::CancelOnIOThread,
-                                          base::Unretained(this)));
+  base::PostTask(FROM_HERE, {BrowserThread::IO},
+                 base::BindOnce(&LoginDelegateEfl::CancelOnIOThread,
+                                base::Unretained(this)));
 }
 
 void LoginDelegateEfl::HandleHttpAuthRequestOnUIThread() {
diff --git a/tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.cc
index a64e713..35aa7aa 100644
--- a/tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.cc
@@ -10,8 +10,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_frame_host.h"
-#include "content/public/browser/resource_dispatcher_host.h"
-#include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "eweb_view.h"
 #include "private/ewk_policy_decision_private.h"
@@ -19,10 +17,7 @@
 using content::BrowserThread;
 using content::RenderViewHost;
 using content::RenderFrameHost;
-using content::ResourceDispatcherHost;
-using content::ResourceRequestInfo;
 using content::WebContents;
-using content::ResourceController;
 
 using web_contents_utils::WebContentsFromFrameID;
 using web_contents_utils::WebContentsFromViewID;
@@ -31,18 +26,16 @@ using web_contents_utils::WebViewFromWebContents;
 
 PolicyResponseDelegateEfl::PolicyResponseDelegateEfl(
     net::URLRequest* request,
-    content::ResourceType resource_type,
     ResourceThrottleEfl* throttle)
     : policy_decision_(new _Ewk_Policy_Decision(request->url(),
                                                request,
-                                               resource_type,
                                                this)),
       throttle_(throttle),
       render_process_id_(0),
       render_frame_id_(0),
       render_view_id_(0) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
 
   if (info) {
@@ -52,18 +45,18 @@ PolicyResponseDelegateEfl::PolicyResponseDelegateEfl(
   } else {
     ResourceRequestInfo::GetRenderFrameForRequest(request, &render_process_id_, &render_frame_id_);
   }
-
+#endif
   // Chromium internal downloads are not associated with any frame or view, we should
   // accept them without EWK-specific logic. For example notification icon is internal
   // chromium download
   if (render_process_id_ > 0 && (render_frame_id_ > 0 || render_view_id_ > 0)) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::UI},
         base::Bind(&PolicyResponseDelegateEfl::HandlePolicyResponseOnUIThread,
                    this));
   } else {
     // Async call required!
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::Bind(&PolicyResponseDelegateEfl::UseResponseOnIOThread, this));
   }
@@ -125,14 +118,14 @@ void PolicyResponseDelegateEfl::HandlePolicyResponseOnUIThread() {
 
 void PolicyResponseDelegateEfl::UseResponse() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::Bind(&PolicyResponseDelegateEfl::UseResponseOnIOThread, this));
 }
 
 void PolicyResponseDelegateEfl::IgnoreResponse() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::Bind(&PolicyResponseDelegateEfl::IgnoreResponseOnIOThread, this));
 }
diff --git a/tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.h
index 651f34e..2d8d300 100644
--- a/tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.h
@@ -6,8 +6,6 @@
 #define POLICY_RESPONSE_DELEGATE_EFL_H_
 
 #include "base/memory/ref_counted.h"
-#include "content/browser/loader/resource_controller.h"
-#include "content/public/common/resource_type.h"
 #include "private/ewk_policy_decision_private.h"
 #include "public/ewk_policy_decision.h"
 #include "url/gurl.h"
@@ -27,7 +25,6 @@ class _Ewk_Policy_Decision;
 class PolicyResponseDelegateEfl: public base::RefCountedThreadSafe<PolicyResponseDelegateEfl> {
  public:
   PolicyResponseDelegateEfl(net::URLRequest* request,
-                            content::ResourceType resource_type,
                             ResourceThrottleEfl* throttle);
 
   void UseResponse();
diff --git a/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.cc b/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.cc
index 52e42bd..20a96b6 100644
--- a/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.cc
@@ -15,12 +15,12 @@ using namespace content;
 void QuotaPermissionContextEfl::RequestQuotaPermission(
     const StorageQuotaParams& params,
     int render_process_id,
-    const QuotaPermissionContext::PermissionCallback& callback) {
+    QuotaPermissionContext::PermissionCallback callback) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::UI},
-        base::Bind(&QuotaPermissionContextEfl::RequestQuotaPermission, this,
-                   params, render_process_id, callback));
+        base::BindOnce(&QuotaPermissionContextEfl::RequestQuotaPermission, this,
+                       params, render_process_id, std::move(callback)));
     return;
   }
 
@@ -29,7 +29,7 @@ void QuotaPermissionContextEfl::RequestQuotaPermission(
 
   if (!web_view) {
     NOTREACHED();
-    DispatchCallback(callback, QUOTA_PERMISSION_RESPONSE_CANCELLED);
+    DispatchCallback(std::move(callback), QUOTA_PERMISSION_RESPONSE_CANCELLED);
     return;
   }
 
@@ -39,21 +39,20 @@ void QuotaPermissionContextEfl::RequestQuotaPermission(
   _Ewk_Quota_Permission_Request* request = new _Ewk_Quota_Permission_Request(
       params.origin_url, params.requested_size, isPersistent);
 
-  web_view->InvokeQuotaPermissionRequest(request, callback);
+  web_view->InvokeQuotaPermissionRequest(request, std::move(callback));
 }
 
 void QuotaPermissionContextEfl::DispatchCallback(
-    const QuotaPermissionContext::PermissionCallback& callback,
+    QuotaPermissionContext::PermissionCallback callback,
     QuotaPermissionContext::QuotaPermissionResponse response) {
   DCHECK_EQ(false, callback.is_null());
 
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)) {
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::IO},
-        base::Bind(&QuotaPermissionContextEfl::DispatchCallback, callback,
-                   response));
+    base::PostTask(FROM_HERE, {BrowserThread::IO},
+                   base::BindOnce(&QuotaPermissionContextEfl::DispatchCallback,
+                                  std::move(callback), response));
     return;
   }
 
-  callback.Run(response);
+  std::move(callback).Run(response);
 }
diff --git a/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.h b/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.h
index c73089b..4277a42 100644
--- a/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.h
@@ -11,9 +11,9 @@ class QuotaPermissionContextEfl : public content::QuotaPermissionContext {
  public:
   void RequestQuotaPermission(const content::StorageQuotaParams& params,
                               int render_process_id,
-                              const PermissionCallback& callback) override;
+                              PermissionCallback callback) override;
 
-  static void DispatchCallback(const PermissionCallback& callback,
+  static void DispatchCallback(PermissionCallback callback,
                                QuotaPermissionResponse response);
 };
 
diff --git a/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc
index 7473084..5123d3c 100644
--- a/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc
@@ -58,7 +58,6 @@ void ResourceDispatcherHostDelegateEfl::RequestBeginning(
     net::URLRequest* request,
     content::ResourceContext* resource_context,
     content::AppCacheService* appcache_service,
-    content::ResourceType resource_type,
     std::vector<std::unique_ptr<content::ResourceThrottle>>* throttles) {
 // Arguments have changed. Needs a relook.
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
diff --git a/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h
index 2d196ea..4e0dac5 100644
--- a/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h
@@ -6,7 +6,6 @@
 #define RESOURCE_DISPATCHER_HOST_DELEGATE_EFL_H
 
 #include "base/compiler_specific.h"
-#include "content/public/browser/resource_dispatcher_host_delegate.h"
 
 namespace net {
 class AuthChallengeInfo;
@@ -29,7 +28,6 @@ class ResourceDispatcherHostDelegateEfl
   void RequestBeginning(net::URLRequest* request,
                         content::ResourceContext* resource_context,
                         content::AppCacheService* appcache_service,
-                        content::ResourceType resource_type,
                         std::vector<std::unique_ptr<content::ResourceThrottle>>*
                             throttles) override;
 
diff --git a/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.cc b/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.cc
index 083282b..67c1a7e 100644
--- a/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.cc
@@ -13,11 +13,13 @@ ResourceThrottleEfl::~ResourceThrottleEfl() {
   }
 }
 
-void ResourceThrottleEfl::WillProcessResponse(bool* defer) {
+void ResourceThrottleEfl::WillProcessResponse(
+    const GURL& response_url,
+    network::mojom::URLResponseHead* response_head,
+    bool* defer) {
   //Stop processing until decision will be granted.
   *defer = true;
 
   policy_delegate_ = new PolicyResponseDelegateEfl(&request_,
-                                                   resource_type_,
                                                    this);
 }
diff --git a/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.h b/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.h
index df44063..b8c6446 100644
--- a/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.h
@@ -5,44 +5,42 @@
 #ifndef RESOURCE_THROTTLE__EFL_H_
 #define RESOURCE_THROTTLE__EFL_H_
 
-#include <cstddef>  //for NULL
 #include "browser/policy_response_delegate_efl.h"
-#include "content/browser/loader/resource_controller.h"
-#include "content/public/browser/resource_throttle.h"
-#include "content/public/common/resource_type.h"
 #include "net/url_request/url_request.h"
+#include "third_party/blink/public/common/loader/url_loader_throttle.h"
 
-class ResourceThrottleEfl : public content::ResourceThrottle {
+class ResourceThrottleEfl : public blink::URLLoaderThrottle {
  public:
-  ResourceThrottleEfl(net::URLRequest& request,
-                      content::ResourceType resource_type)
-      : request_(request),
-        resource_type_(resource_type),
-        policy_delegate_(NULL) {}
+  ResourceThrottleEfl(net::URLRequest& request)
+      : request_(request), policy_delegate_(nullptr) {}
 
-  ~ResourceThrottleEfl();
+  ~ResourceThrottleEfl() override;
 
-  void WillProcessResponse(bool* defer) override;
-
-  const char* GetNameForLogging() override { return "ResourceThrottleEfl"; }
+  // blink::URLLoaderThrottle overrides;
+  void WillProcessResponse(const GURL& response_url,
+                           network::mojom::URLResponseHead* response_head,
+                           bool* defer) override;
 
   void Resume() {
     // EWK_BRINGUP. Removed in upstream
     // 64fa092bc4ccdcb1c0cc08b93d6c1bd49363adb0
     // controller()->Resume();
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
     Resume();
+#endif
   }
 
   void Ignore() {
     // EWK_BRINGUP. Removed in upstream
     // 64fa092bc4ccdcb1c0cc08b93d6c1bd49363adb0
     // controller()->CancelAndIgnore();
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
     Cancel();
+#endif
   }
 
  private:
   net::URLRequest& request_;
-  content::ResourceType resource_type_;
   scoped_refptr<PolicyResponseDelegateEfl> policy_delegate_;
 };
 #endif /*RESOURCE_THROTTLE__EFL_H_*/
diff --git a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.cc b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.cc
index 856ce03..87608cb 100644
--- a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.cc
+++ b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.cc
@@ -9,8 +9,8 @@
 
 Popup_Menu_Item::Popup_Menu_Item(const content::MenuItem& item)
     : type(static_cast<Popup_Menu_Item_Type>(item.type)),
-      textDirection(item.rtl ? blink::kWebTextDirectionRightToLeft
-                             : blink::kWebTextDirectionLeftToRight),
+      textDirection(item.rtl ? base::i18n::RIGHT_TO_LEFT
+                             : base::i18n::LEFT_TO_RIGHT),
       hasTextDirectionOverride(item.has_directional_override),
       isEnabled(item.enabled),
       isLabel(true),
@@ -31,9 +31,9 @@ const char* popup_menu_item_text_get(const Popup_Menu_Item* item) {
   return item->text.c_str();
 }
 
-blink::WebTextDirection popup_menu_item_text_direction_get(
+base::i18n::TextDirection popup_menu_item_text_direction_get(
     const Popup_Menu_Item* item) {
-  EINA_SAFETY_ON_NULL_RETURN_VAL(item, blink::kWebTextDirectionLeftToRight);
+  EINA_SAFETY_ON_NULL_RETURN_VAL(item, base::i18n::LEFT_TO_RIGHT);
 
   return item->textDirection;
 }
diff --git a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.h b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.h
index e97e397..d4607c8 100644
--- a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.h
+++ b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.h
@@ -23,7 +23,8 @@
 
 #include <Eina.h>
 #include <string>
-#include "third_party/blink/public/web/web_text_direction.h"
+
+#include "base/i18n/rtl.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -71,7 +72,8 @@ const char *popup_menu_item_text_get(const Popup_Menu_Item *item);
  *
  * @return the text direction of the @a item.
  */
-blink::WebTextDirection popup_menu_item_text_direction_get(const Popup_Menu_Item *item);
+base::i18n::TextDirection popup_menu_item_text_direction_get(
+    const Popup_Menu_Item* item);
 
 /**
  * Returns whether the popup menu item has text direction override.
diff --git a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h
index d63ef62..aaf7651 100644
--- a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h
+++ b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h
@@ -5,9 +5,9 @@
 #ifndef popup_menu_item_private_h
 #define popup_menu_item_private_h
 
+#include "base/i18n/rtl.h"
 #include "content/public/common/menu_item.h"
 #include "popup_menu_item.h"
-#include "third_party/blink/public/web/web_text_direction.h"
 
 #include <string>
 
@@ -20,7 +20,7 @@ public:
     explicit Popup_Menu_Item(const content::MenuItem& menuitem);
 
     Popup_Menu_Item_Type type;
-    blink::WebTextDirection textDirection;
+    base::i18n::TextDirection textDirection;
 
     bool hasTextDirectionOverride;
     bool isEnabled;
diff --git a/tizen_src/ewk/efl_integration/browser/sound_effect.cc b/tizen_src/ewk/efl_integration/browser/sound_effect.cc
index fe4640b..57878f4 100644
--- a/tizen_src/ewk/efl_integration/browser/sound_effect.cc
+++ b/tizen_src/ewk/efl_integration/browser/sound_effect.cc
@@ -4,7 +4,7 @@
 
 #include "browser/sound_effect.h"
 
-#include "base/logging.h"
+#include "base/notreached.h"
 
 namespace sound_effect {
 
diff --git a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.cc
index 9375715..95a5f15 100644
--- a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.cc
@@ -4,6 +4,7 @@
 
 #include "browser/ssl_host_state_delegate_efl.h"
 
+#include "base/callback.h"
 #include "net/base/hash_value.h"
 
 using content::SSLHostStateDelegate;
@@ -59,19 +60,20 @@ void SSLHostStateDelegateEfl::HostRanInsecureContent(
 bool SSLHostStateDelegateEfl::DidHostRunInsecureContent(
     const std::string& host,
     int child_id,
-    InsecureContentType content_type) const {
+    InsecureContentType content_type) {
   // Intentional no-op for efl WebView.
   return false;
 }
 
 void SSLHostStateDelegateEfl::AllowCert(const std::string& host,
                                         const net::X509Certificate& cert,
-                                        int error) {
+                                        int error,
+                                        WebContents* web_contents) {
   cert_policy_for_host_[host].Allow(cert, error);
 }
 
 void SSLHostStateDelegateEfl::Clear(
-    const base::Callback<bool(const std::string&)>& host_filter) {
+    base::RepeatingCallback<bool(const std::string&)> host_filter) {
   cert_policy_for_host_.clear();
 }
 
@@ -79,7 +81,7 @@ SSLHostStateDelegate::CertJudgment SSLHostStateDelegateEfl::QueryPolicy(
     const std::string& host,
     const net::X509Certificate& cert,
     int error,
-    bool* expired_previous_decision) {
+    WebContents* web_contents) {
   return cert_policy_for_host_[host].Check(cert, error)
              ? SSLHostStateDelegate::ALLOWED
              : SSLHostStateDelegate::DENIED;
@@ -90,8 +92,8 @@ void SSLHostStateDelegateEfl::RevokeUserAllowExceptions(
   cert_policy_for_host_.erase(host);
 }
 
-bool SSLHostStateDelegateEfl::HasAllowException(const std::string& host) const {
+bool SSLHostStateDelegateEfl::HasAllowException(const std::string& host,
+                                                WebContents* web_contents) {
   return false;
 }
-
 }
diff --git a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h
index 5e9992d..61723b9 100644
--- a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h
@@ -46,17 +46,18 @@ class SSLHostStateDelegateEfl : public content::SSLHostStateDelegate {
   // a specified |error| type.
   void AllowCert(const std::string& host,
                  const net::X509Certificate& cert,
-                 int error) override;
+                 int error,
+                 WebContents* web_contents) override;
 
   void Clear(
-      const base::Callback<bool(const std::string&)>& host_filter) override;
+      base::RepeatingCallback<bool(const std::string&)> host_filter) override;
 
   // Queries whether |cert| is allowed or denied for |host| and |error|.
   content::SSLHostStateDelegate::CertJudgment QueryPolicy(
       const std::string& host,
       const net::X509Certificate& cert,
       int error,
-      bool* expired_previous_decision) override;
+      WebContents* web_contents) override;
 
   // Records that a host has run insecure content.
   void HostRanInsecureContent(const std::string& host,
@@ -64,10 +65,9 @@ class SSLHostStateDelegateEfl : public content::SSLHostStateDelegate {
                               InsecureContentType content_type) override;
 
   // Returns whether the specified host ran insecure content.
-  bool DidHostRunInsecureContent(
-      const std::string& host,
-      int child_id,
-      InsecureContentType content_type) const override;
+  bool DidHostRunInsecureContent(const std::string& host,
+                                 int child_id,
+                                 InsecureContentType content_type) override;
 
   // Revokes all SSL certificate error allow exceptions made by the user for
   // |host|.
@@ -77,7 +77,8 @@ class SSLHostStateDelegateEfl : public content::SSLHostStateDelegate {
   // |host|. This does not mean that *all* certificate errors are allowed, just
   // that there exists an exception. To see if a particular certificate and
   // error combination exception is allowed, use QueryPolicy().
-  bool HasAllowException(const std::string& host) const override;
+  bool HasAllowException(const std::string& host,
+                         WebContents* web_contents) override;
 
  private:
   // Certificate policies for each host.
diff --git a/tizen_src/ewk/efl_integration/browser_context_efl.cc b/tizen_src/ewk/efl_integration/browser_context_efl.cc
index a3b32b4..6563b9d 100644
--- a/tizen_src/ewk/efl_integration/browser_context_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser_context_efl.cc
@@ -19,7 +19,7 @@
 #include "components/prefs/pref_service.h"
 #include "components/prefs/pref_service_factory.h"
 #include "components/user_prefs/user_prefs.h"
-#include "components/visitedlink/browser/visitedlink_master.h"
+#include "components/visitedlink/browser/visitedlink_writer.h"
 #include "content/common/paths_efl.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
@@ -51,7 +51,7 @@ static void CreateNetworkDelegateOnIOThread(BrowserContextEfl* context,
 
 BrowserContextEfl::ResourceContextEfl::ResourceContextEfl(
     scoped_refptr<CookieManager> cookie_manager)
-    : getter_(NULL), cookie_manager_(cookie_manager) {}
+    : getter_(nullptr), cookie_manager_(cookie_manager) {}
 
 BrowserContextEfl::~BrowserContextEfl() {
 #if defined(TIZEN_AUTOFILL_SUPPORT)
@@ -131,7 +131,7 @@ BrowserContextEfl::BrowserContextEfl(EWebContext* web_context, bool incognito)
       web_context_(web_context),
       temp_dir_creation_attempted_(false),
       incognito_(incognito) {
-  InitVisitedLinkMaster();
+  InitVisitedLinkWriter();
 
   PrefRegistrySimple* pref_registry = new PrefRegistrySimple();
 
@@ -153,7 +153,9 @@ BrowserContextEfl::BrowserContextEfl(EWebContext* web_context, bool incognito)
   autofill::PersonalDataManagerFactory::GetInstance()->PersonalDataManagerAdd(
       this);
 #endif
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   BrowserContext::Initialize(this, GetPath());
+#endif
 }
 
 std::unique_ptr<ZoomLevelDelegate> BrowserContextEfl::CreateZoomLevelDelegate(
@@ -174,7 +176,7 @@ BrowserContextEfl::GetResourceContextEfl() {
 }
 
 // TODO Can this API be called from multiple threads?
-base::FilePath BrowserContextEfl::GetPath() const {
+base::FilePath BrowserContextEfl::GetPath() {
   if (IsOffTheRecord()) {
     // Empty path indicates in memory storage. All data that would be persistent
     // are stored in memory and are gone when closing browser, what is a
@@ -221,19 +223,18 @@ net::URLRequestContextGetter* BrowserContextEfl::CreateRequestContext(
     // NetWorkDelegate must be created on IO thread
     base::WaitableEvent done(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                              base::WaitableEvent::InitialState::NOT_SIGNALED);
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::IO},
-        base::Bind(CreateNetworkDelegateOnIOThread, this, &done));
+    base::PostTask(FROM_HERE, {BrowserThread::IO},
+                   base::Bind(CreateNetworkDelegateOnIOThread, this, &done));
     done.Wait();
   }
 
   request_context_getter_ = new URLRequestContextGetterEfl(
       std::move(network_delegate_for_getter_), false, cache_base_path,
-      base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::IO}),
+      base::CreateSingleThreadTaskRunner({BrowserThread::IO}),
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
       BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
 #else
-      base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI}),
+      base::CreateSingleThreadTaskRunner({BrowserThread::UI}),
 #endif
       protocol_handlers, std::move(request_interceptors), NULL);
   web_context_->cookieManager()->SetRequestContextGetter(
@@ -282,18 +283,18 @@ void BrowserContextEfl::ReadCertificateAndAdd(base::FilePath* file_path) {
 #endif  // !defined(EWK_BRINGUP)
 }
 
-void BrowserContextEfl::InitVisitedLinkMaster() {
+void BrowserContextEfl::InitVisitedLinkWriter() {
   if (!IsOffTheRecord()) {
-    visitedlink_master_.reset(
-        new visitedlink::VisitedLinkMaster(this, this, false));
-    visitedlink_master_->Init();
+    visitedlink_writer_.reset(
+        new visitedlink::VisitedLinkWriter(this, this, false));
+    visitedlink_writer_->Init();
   }
 }
 
 void BrowserContextEfl::AddVisitedURLs(const std::vector<GURL>& urls) {
   if (!IsOffTheRecord()) {
-    DCHECK(visitedlink_master_);
-    visitedlink_master_->AddURLs(urls);
+    DCHECK(visitedlink_writer_);
+    visitedlink_writer_->AddURLs(urls);
   }
 }
 
diff --git a/tizen_src/ewk/efl_integration/browser_context_efl.h b/tizen_src/ewk/efl_integration/browser_context_efl.h
index dfb2a28..2f8f8fb 100644
--- a/tizen_src/ewk/efl_integration/browser_context_efl.h
+++ b/tizen_src/ewk/efl_integration/browser_context_efl.h
@@ -14,7 +14,6 @@
 #include "browser/geolocation/geolocation_permission_context_efl.h"
 #include "browser/ssl_host_state_delegate_efl.h"
 #include "components/visitedlink/browser/visitedlink_delegate.h"
-#include "components/visitedlink/browser/visitedlink_master.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/storage_partition.h"
@@ -26,7 +25,7 @@ class PrefService;
 class EWebContext;
 
 namespace visitedlink {
-class VisitedLinkMaster;
+class VisitedLinkWriter;
 }
 
 typedef std::map<std::string, std::string> HTTPCustomHeadersEflMap;
@@ -65,11 +64,14 @@ class BrowserContextEfl : public BrowserContext,
   ~BrowserContextEfl();
 
   // BrowserContext implementation.
-  net::URLRequestContextGetter* CreateMediaRequestContext() override;
+  net::URLRequestContextGetter* CreateMediaRequestContext();
   net::URLRequestContextGetter* CreateMediaRequestContextForStoragePartition(
       const base::FilePath&,
-      bool) override;
-  bool IsOffTheRecord() const override { return incognito_; }
+      bool);
+  StorageNotificationService* GetStorageNotificationService() override {
+    return nullptr;
+  }
+  bool IsOffTheRecord() override { return incognito_; }
 
   // visitedlink::VisitedLinkDelegate implementation.
   void RebuildTable(const scoped_refptr<URLEnumerator>& enumerator) override;
@@ -83,14 +85,14 @@ class BrowserContextEfl : public BrowserContext,
     return 0;
   }
   PushMessagingService* GetPushMessagingService() override { return 0; }
-  base::FilePath GetPath() const override;
+  base::FilePath GetPath() override;
   base::FilePath GetCachePath() const;
   BackgroundSyncController* GetBackgroundSyncController() override;
   net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       const base::FilePath& partition_path,
       bool in_memory,
       ProtocolHandlerMap* protocol_handlers,
-      URLRequestInterceptorScopedVector request_interceptors) override {
+      URLRequestInterceptorScopedVector request_interceptors) {
     return nullptr;
   }
   ClientHintsControllerDelegate* GetClientHintsControllerDelegate() override;
@@ -106,8 +108,8 @@ class BrowserContextEfl : public BrowserContext,
   // These methods map to Add methods in visitedlink::VisitedLinkMaster.
   void AddVisitedURLs(const std::vector<GURL>& urls);
 
-  // Reset visitedlink master and initialize it.
-  void InitVisitedLinkMaster();
+  // Reset visitedlink writer and initialize it.
+  void InitVisitedLinkWriter();
 
   ResourceContextEfl* GetResourceContextEfl();
 
@@ -129,8 +131,7 @@ class BrowserContextEfl : public BrowserContext,
   PermissionControllerDelegate* GetPermissionControllerDelegate() override;
   mutable std::unique_ptr<GeolocationPermissionContextEfl>
       geolocation_permission_context_;
-  std::unique_ptr<visitedlink::VisitedLinkMaster> visitedlink_master_;
-
+  std::unique_ptr<visitedlink::VisitedLinkWriter> visitedlink_writer_;
   ResourceContextEfl* resource_context_;
   scoped_refptr<URLRequestContextGetterEfl> request_context_getter_;
   EWebContext* web_context_;
diff --git a/tizen_src/ewk/efl_integration/command_line_efl.cc b/tizen_src/ewk/efl_integration/command_line_efl.cc
index d95fe15..a0945ca 100644
--- a/tizen_src/ewk/efl_integration/command_line_efl.cc
+++ b/tizen_src/ewk/efl_integration/command_line_efl.cc
@@ -10,6 +10,7 @@
 #include <unistd.h>
 
 #include "base/base_switches.h"
+#include "base/logging.h"
 #include "cc/base/switches.h"
 #include "common/content_switches_efl.h"
 #include "components/viz/common/switches.h"
diff --git a/tizen_src/ewk/efl_integration/common/content_client_efl.cc b/tizen_src/ewk/efl_integration/common/content_client_efl.cc
index ac0e580..09832e5 100644
--- a/tizen_src/ewk/efl_integration/common/content_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/common/content_client_efl.cc
@@ -8,15 +8,15 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/l10n/l10n_util.h"
 
-base::string16 ContentClientEfl::GetLocalizedString(int message_id) const {
+base::string16 ContentClientEfl::GetLocalizedString(int message_id) {
   // TODO(boliu): Used only by WebKit, so only bundle those resources for
   // Android WebView.
   return l10n_util::GetStringUTF16(message_id);
 }
 
 base::StringPiece ContentClientEfl::GetDataResource(
-      int resource_id,
-      ui::ScaleFactor scale_factor) const {
+    int resource_id,
+    ui::ScaleFactor scale_factor) {
   // TODO(boliu): Used only by WebKit, so only bundle those resources for
   // Android WebView.
   return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
diff --git a/tizen_src/ewk/efl_integration/common/content_client_efl.h b/tizen_src/ewk/efl_integration/common/content_client_efl.h
index d36062e..be9f9c6 100644
--- a/tizen_src/ewk/efl_integration/common/content_client_efl.h
+++ b/tizen_src/ewk/efl_integration/common/content_client_efl.h
@@ -16,11 +16,10 @@ namespace IPC {
 class ContentClientEfl : public content::ContentClient {
  public:
   // ContentClient implementation.
-  virtual base::string16 GetLocalizedString(int message_id) const override;
-  virtual base::StringPiece GetDataResource(
-      int resource_id,
-      ui::ScaleFactor scale_factor) const override;
-  virtual bool CanSendWhileSwappedOut(const IPC::Message* message) override;
+  base::string16 GetLocalizedString(int message_id) override;
+  base::StringPiece GetDataResource(int resource_id,
+                                    ui::ScaleFactor scale_factor) override;
+  bool CanSendWhileSwappedOut(const IPC::Message* message);
 };
 
 #endif  // CONTENT_CLIENT_EFL_H_
diff --git a/tizen_src/ewk/efl_integration/common/print_pages_params.cc b/tizen_src/ewk/efl_integration/common/print_pages_params.cc
index aa79276..b54bb16 100644
--- a/tizen_src/ewk/efl_integration/common/print_pages_params.cc
+++ b/tizen_src/ewk/efl_integration/common/print_pages_params.cc
@@ -12,7 +12,7 @@ PrintParams::PrintParams()
       desired_dpi(0),
       is_first_request(true),
       print_to_pdf(true),
-      print_scaling_option(blink::kWebPrintScalingOptionSourceSize),
+      print_scaling_option(printing::mojom::PrintScalingOption::kSourceSize),
       document_cookie(0) {}
 
 PrintPagesParams::PrintPagesParams()
diff --git a/tizen_src/ewk/efl_integration/common/print_pages_params.h b/tizen_src/ewk/efl_integration/common/print_pages_params.h
index ade2a39..cab6d6c 100644
--- a/tizen_src/ewk/efl_integration/common/print_pages_params.h
+++ b/tizen_src/ewk/efl_integration/common/print_pages_params.h
@@ -8,9 +8,9 @@
 #include <vector>
 
 #include "base/files/file_path.h"
-#include "base/memory/shared_memory.h"
+#include "base/memory/unsafe_shared_memory_region.h"
+#include "printing/mojom/print.mojom.h"
 #include "printing/printing_export.h"
-#include "third_party/blink/public/web/web_print_scaling_option.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -24,7 +24,7 @@ struct PrintParams {
   int desired_dpi;
   bool is_first_request;
   bool print_to_pdf;
-  blink::WebPrintScalingOption print_scaling_option;
+  printing::mojom::PrintScalingOption print_scaling_option;
   int document_cookie;
 };
 
@@ -44,7 +44,9 @@ struct PrintPageParams {
 };
 
 struct DidPrintPagesParams {
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   base::SharedMemoryHandle metafile_data_handle;
+#endif
   uint32_t data_size;
   int document_cookie;
   base::FilePath filename;
diff --git a/tizen_src/ewk/efl_integration/common/render_messages_ewk.h b/tizen_src/ewk/efl_integration/common/render_messages_ewk.h
index f42ff5b..209a955 100644
--- a/tizen_src/ewk/efl_integration/common/render_messages_ewk.h
+++ b/tizen_src/ewk/efl_integration/common/render_messages_ewk.h
@@ -67,7 +67,9 @@ IPC_ENUM_TRAITS(Ewk_CSP_Header_Type)
 IPC_ENUM_TRAITS(Ewk_Hit_Test_Mode)
 
 IPC_STRUCT_TRAITS_BEGIN(DidPrintPagesParams)
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   IPC_STRUCT_TRAITS_MEMBER(metafile_data_handle)
+#endif
   IPC_STRUCT_TRAITS_MEMBER(data_size)
   IPC_STRUCT_TRAITS_MEMBER(document_cookie)
   IPC_STRUCT_TRAITS_MEMBER(filename)
diff --git a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
index e912fd5..13b1975 100644
--- a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
@@ -16,14 +16,12 @@
 #include "browser/editor_client_observer.h"
 #include "browser/quota_permission_context_efl.h"
 #include "browser/render_message_filter_efl.h"
-#include "browser/resource_dispatcher_host_delegate_efl.h"
 #include "browser/web_view_browser_message_filter.h"
 #include "common/content_switches_efl.h"
 #include "content/browser/web_contents/web_contents_view_efl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_iterator.h"
-#include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "common/version_info.h"
@@ -176,12 +174,6 @@ void ContentBrowserClientEfl::DispatchPopupBlockedOnUIThread(
       target_url.spec().c_str());
 }
 
-void ContentBrowserClientEfl::ResourceDispatcherHostCreated() {
-  ResourceDispatcherHost* host = ResourceDispatcherHost::Get();
-  resource_disp_host_del_efl_.reset(new ResourceDispatcherHostDelegateEfl());
-  host->SetDelegate(resource_disp_host_del_efl_.get());
-}
-
 void ContentBrowserClientEfl::AllowCertificateError(
     WebContents* web_contents,
     int cert_error,
@@ -189,8 +181,7 @@ void ContentBrowserClientEfl::AllowCertificateError(
     const GURL& request_url,
     bool is_main_frame_request,
     bool strict_enforcement,
-    bool expired_previous_decision,
-    const base::Callback<void(CertificateRequestResultType)>& callback) {
+    base::OnceCallback<void(CertificateRequestResultType)> callback) {
   DCHECK(web_contents);
   WebContentsDelegate* delegate = web_contents->GetDelegate();
   if (!delegate) {
@@ -204,8 +195,8 @@ void ContentBrowserClientEfl::AllowCertificateError(
   // FIXME: EWK_BRINGUP definition should be removed.
   static_cast<content::WebContentsDelegateEfl*>(delegate)
       ->RequestCertificateConfirm(web_contents, cert_error, ssl_info,
-                                  request_url, resource_type, overridable,
-                                  strict_enforcement, callback);
+                                  request_url, overridable, strict_enforcement,
+                                  callback);
 #endif  // !defined(EWK_BRINGUP)
 }
 
@@ -283,8 +274,7 @@ void ContentBrowserClientEfl::OverrideWebkitPrefs(
 }
 
 void ContentBrowserClientEfl::RenderProcessWillLaunch(
-    content::RenderProcessHost* host,
-    service_manager::mojom::ServiceRequest* service_request) {
+    content::RenderProcessHost* host) {
   host->AddFilter(new RenderMessageFilterEfl(host->GetID()));
   host->AddFilter(new editing::EditorClientObserver(host->GetID()));
 #if defined(OS_TIZEN)
@@ -303,7 +293,7 @@ void ContentBrowserClientEfl::SetCertificatePem(const net::SSLInfo& ssl_info,
                                            &pem_certificate))
     return;
 
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::Bind(&ContentBrowserClientEfl::SetCertificatePemOnUIThread,
                  render_process_id, render_view_id, pem_certificate));
@@ -354,12 +344,11 @@ ContentBrowserClientEfl::CreateQuotaPermissionContext() {
   return new QuotaPermissionContextEfl();
 }
 
-std::string ContentBrowserClientEfl::GetProduct() const {
+std::string ContentBrowserClientEfl::GetProduct() {
   return EflWebView::VersionInfo::GetInstance()->ProductNameAndVersionForUserAgent();
 }
 
-std::string ContentBrowserClientEfl::GetUserAgent() const {
+std::string ContentBrowserClientEfl::GetUserAgent() {
   return EflWebView::VersionInfo::GetInstance()->DefaultUserAgent();
 }
-
 }
diff --git a/tizen_src/ewk/efl_integration/content_browser_client_efl.h b/tizen_src/ewk/efl_integration/content_browser_client_efl.h
index 1864567..e683da1 100644
--- a/tizen_src/ewk/efl_integration/content_browser_client_efl.h
+++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.h
@@ -7,6 +7,7 @@
 
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
+#include "net/cookies/canonical_cookie.h"
 #include "third_party/blink/public/web/web_window_features.h"
 
 namespace base {
@@ -21,7 +22,6 @@ class BrowserMainPartsEfl;
 #if defined(ENABLE_NOTIFICATIONS)
 class NotificationControllerEfl;
 #endif
-class ResourceDispatcherHostDelegateEfl;
 class WebContents;
 class WebContentsView;
 
@@ -38,14 +38,14 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
 
   // Allows the embedder to pass extra command line flags.
   // switches::kProcessType will already be set at this point.
-  virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
-                                              int child_process_id) override;
+  void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
+                                      int child_process_id) override;
 
   bool CanCreateWindow(RenderFrameHost* opener,
                        const GURL& opener_url,
                        const GURL& opener_top_level_frame_url,
                        const GURL& source_origin,
-                       content::mojom::WindowContainerType container_type,
+                       mojom::WindowContainerType container_type,
                        const GURL& target_url,
                        const Referrer& referrer,
                        const std::string& frame_name,
@@ -55,8 +55,6 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
                        bool opener_suppressed,
                        bool* no_javascript_access);
 
-  virtual void ResourceDispatcherHostCreated() override;
-
   scoped_refptr<QuotaPermissionContext> CreateQuotaPermissionContext() override;
 
   void AllowCertificateError(
@@ -66,9 +64,7 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
       const GURL& request_url,
       bool is_main_frame_request,
       bool strict_enforcement,
-      bool expired_previous_decision,
-      const base::Callback<void(CertificateRequestResultType)>& callback)
-      override;
+      base::OnceCallback<void(CertificateRequestResultType)> callback) override;
 
 #if defined(ENABLE_NOTIFICATIONS)
   virtual PlatformNotificationService* GetPlatformNotificationService()
@@ -77,32 +73,30 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
   NotificationControllerEfl* GetNotificationController() const;
 #endif
 
-  virtual bool AllowGetCookie(const GURL& url,
-                              const GURL& first_party,
-                              const net::CookieList& cookie_list,
-                              content::ResourceContext* context,
-                              int render_process_id,
-                              int render_frame_id) override;
+  bool AllowGetCookie(const GURL& url,
+                      const GURL& first_party,
+                      const net::CookieList& cookie_list,
+                      ResourceContext* context,
+                      int render_process_id,
+                      int render_frame_id);
 
-  virtual bool AllowSetCookie(const GURL& url,
-                              const GURL& first_party,
-                              const net::CanonicalCookie& cookie,
-                              content::ResourceContext* context,
-                              int render_process_id,
-                              int render_frame_id) override;
+  bool AllowSetCookie(const GURL& url,
+                      const GURL& first_party,
+                      const net::CanonicalCookie& cookie,
+                      ResourceContext* context,
+                      int render_process_id,
+                      int render_frame_id);
 
-  virtual void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
-                                   content::WebPreferences* prefs) override;
+  void OverrideWebkitPrefs(RenderViewHost* render_view_host,
+                           WebPreferences* prefs) override;
 
-  virtual void RenderProcessWillLaunch(
-      content::RenderProcessHost* host,
-      service_manager::mojom::ServiceRequest* service_request) override;
+  void RenderProcessWillLaunch(RenderProcessHost* host) override;
 
-  virtual void SetCertificatePem(const net::SSLInfo& ssl_info,
-                                 int render_process_id,
-                                 int render_view_id);
+  void SetCertificatePem(const net::SSLInfo& ssl_info,
+                         int render_process_id,
+                         int render_view_id);
 
-  content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
+  DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
 
   std::string GetApplicationLocale() override;
 
@@ -113,8 +107,8 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
     browser_context_efl_ = context;
   }
 
-  std::string GetProduct() const override;
-  std::string GetUserAgent() const override;
+  std::string GetProduct() override;
+  std::string GetUserAgent() override;
 
  private:
   static void SetCertificatePemOnUIThread(int render_process_id,
@@ -123,8 +117,6 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
   static void DispatchPopupBlockedOnUIThread(int render_process_id,
                                              const GURL& target_url);
 
-  std::unique_ptr<ResourceDispatcherHostDelegateEfl>
-      resource_disp_host_del_efl_;
   BrowserMainPartsEfl* browser_main_parts_efl_;
 
 #if defined(ENABLE_NOTIFICATIONS)
diff --git a/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc b/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc
index ed1622b..e261fc3 100644
--- a/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc
@@ -5,7 +5,6 @@
 #include "content_main_delegate_efl.h"
 
 #include "base/path_service.h"
-#include "browser/resource_dispatcher_host_delegate_efl.h"
 #include "command_line_efl.h"
 #include "content/browser/gpu/gpu_main_thread_factory.h"
 #include "content/browser/gpu/gpu_process_host.h"
diff --git a/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc b/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
index 991222c..c454f3e 100644
--- a/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
+++ b/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "common/web_contents_utils.h"
@@ -143,12 +144,12 @@ void ContextMenuControllerEfl::GetProposedContextMenu() {
     AddItemToProposedList(EWK_CONTEXT_MENU_ITEM_TYPE_ACTION, EWK_CONTEXT_MENU_ITEM_TAG_PASTE,
         std::string(dgettext("WebKit", "IDS_WEBVIEW_OPT_PASTE")));
   }
-  if (params_.media_type != blink::WebContextMenuData::kMediaTypeImage &&
+  if (params_.media_type != blink::ContextMenuDataMediaType::kImage &&
       !params_.selection_text.empty() && params_.is_editable) {
     AddItemToProposedList(EWK_CONTEXT_MENU_ITEM_TYPE_ACTION, EWK_CONTEXT_MENU_ITEM_TAG_CUT,
         std::string(dgettext("WebKit", "IDS_WEBVIEW_OPT_CUT_ABB")));
   }
-  if (params_.media_type != blink::WebContextMenuData::kMediaTypeImage &&
+  if (params_.media_type != blink::ContextMenuDataMediaType::kImage &&
       !params_.selection_text.empty()) {
     AddItemToProposedList(EWK_CONTEXT_MENU_ITEM_TYPE_ACTION, EWK_CONTEXT_MENU_ITEM_TAG_COPY,
         std::string(dgettext("WebKit", "IDS_WEBVIEW_OPT_COPY")));
@@ -197,7 +198,7 @@ void ContextMenuControllerEfl::GetProposedContextMenu() {
   }
 
   RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(web_contents_.GetRenderWidgetHostView());
-  if ((params_.media_type != blink::WebContextMenuData::kMediaTypeImage &&
+  if ((params_.media_type != blink::ContextMenuDataMediaType::kImage &&
        !params_.selection_text.empty()) ||
       (params_.is_editable && (rwhv && !rwhv->IsLastAvailableTextEmpty()))) {
     AddItemToProposedList(EWK_CONTEXT_MENU_ITEM_TYPE_ACTION, EWK_CONTEXT_MENU_ITEM_TAG_SELECT_WORD,
@@ -570,8 +571,7 @@ void ContextMenuControllerEfl::OnDownloadUpdated(
 base::FilePath ContextMenuControllerEfl::DownloadFile(
     const GURL url,
     const base::FilePath outputDir,
-    const download::DownloadUrlParameters::OnStartedCallback& callback =
-        download::DownloadUrlParameters::OnStartedCallback()) {
+    download::DownloadUrlParameters::OnStartedCallback callback) {
   LOG(INFO) << "Downloading file: " << url << "to: "<< outputDir.value();
   const GURL referrer = web_contents_.GetVisibleURL();
   RenderFrameHost* frame_host = web_contents_.GetMainFrame();
@@ -580,7 +580,7 @@ base::FilePath ContextMenuControllerEfl::DownloadFile(
   auto dl_params = std::make_unique<download::DownloadUrlParameters>(
       url, frame_host->GetProcess()->GetID(),
       frame_host->GetRenderViewHost()->GetRoutingID(),
-      frame_host->GetRoutingID(), NO_TRAFFIC_ANNOTATION_YET);
+      frame_host->GetRoutingID(), MISSING_TRAFFIC_ANNOTATION);
   dl_params->set_post_id(-1);
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
   dl_params->set_referrer(
@@ -592,10 +592,10 @@ base::FilePath ContextMenuControllerEfl::DownloadFile(
   base::FilePath fileName = net::GenerateFileName(url,"","","","","");
   base::FilePath fullPath = outputDir.Append(fileName);
 
-  while (PathExists(fullPath)) {
+  while (base::PathExists(fullPath)) {
     unsigned int i;
     base::FilePath fileNameTmp;
-    for (i = 0; PathExists(fullPath) && i <= 999; i++) {
+    for (i = 0; base::PathExists(fullPath) && i <= 999; i++) {
       char buffer[6];
       snprintf(buffer, sizeof(buffer), "(%d)", i);
       fileNameTmp = fileName.InsertBeforeExtension(std::string(buffer));
@@ -606,7 +606,7 @@ base::FilePath ContextMenuControllerEfl::DownloadFile(
   dl_params->set_suggested_name(base::UTF8ToUTF16(fileName.value()));
   dl_params->set_file_path(fullPath);
   dl_params->set_prompt(true);
-  dl_params->set_callback(callback);
+  dl_params->set_callback(std::move(callback));
 
   DownloadManager* dlm =
       BrowserContext::GetDownloadManager(web_contents_.GetBrowserContext());
diff --git a/tizen_src/ewk/efl_integration/context_menu_controller_efl.h b/tizen_src/ewk/efl_integration/context_menu_controller_efl.h
index 49773b8..8418ca0 100644
--- a/tizen_src/ewk/efl_integration/context_menu_controller_efl.h
+++ b/tizen_src/ewk/efl_integration/context_menu_controller_efl.h
@@ -12,9 +12,9 @@
 #include "browser/javascript_modal_dialog_efl.h"
 #include "components/download/public/common/download_item.h"
 #include "components/download/public/common/download_url_parameters.h"
+#include "content/public/browser/context_menu_params.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/context_menu_params.h"
 #include "public/ewk_context_menu_internal.h"
 
 class EWebView;
@@ -104,7 +104,7 @@ class ContextMenuControllerEfl : public download::DownloadItem::Observer {
   base::FilePath DownloadFile(
       const GURL url,
       const base::FilePath outputDir,
-      const download::DownloadUrlParameters::OnStartedCallback& callback);
+      download::DownloadUrlParameters::OnStartedCallback callback);
   bool TriggerDownloadCb(const GURL url);
   void OpenURL(const GURL url, const WindowOpenDisposition disposition);
 #if defined(OS_TIZEN)
diff --git a/tizen_src/ewk/efl_integration/cookie_manager.cc b/tizen_src/ewk/efl_integration/cookie_manager.cc
index e58932a..044680f 100644
--- a/tizen_src/ewk/efl_integration/cookie_manager.cc
+++ b/tizen_src/ewk/efl_integration/cookie_manager.cc
@@ -15,12 +15,12 @@
 #include "content/public/browser/browser_thread.h"
 #include "eweb_context.h"
 #include "net/base/net_errors.h"
-#include "net/base/static_cookie_policy.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_options.h"
 #include "net/cookies/cookie_util.h"
 #include "net/cookies/parsed_cookie.h"
+#include "net/cookies/static_cookie_policy.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
@@ -128,7 +128,7 @@ void CookieManager::DeleteCookiesAsync(const std::string& url,
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   std::unique_ptr<net::CookieStore> cookie_store = GetCookieStore();
   if (cookie_store.get()) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::Bind(DeleteCookiesOnIOThread,
                    base::Passed(std::move(cookie_store)), url, cookie_name));
@@ -156,19 +156,17 @@ void CookieManager::SetStoragePath(const std::string& path,
 
  scoped_refptr<content::URLRequestContextGetterEfl> context_getter = GetContextGetter();
  if (context_getter.get()) {
-   base::PostTaskWithTraits(
-       FROM_HERE, {BrowserThread::IO},
-       base::Bind(SetStoragePathOnIOThread, context_getter, path,
-                  persist_session_cookies, file_storage_type));
+   base::PostTask(FROM_HERE, {BrowserThread::IO},
+                  base::Bind(SetStoragePathOnIOThread, context_getter, path,
+                             persist_session_cookies, file_storage_type));
  }
 }
 
 void CookieManager::GetAcceptPolicyAsync(Ewk_Cookie_Manager_Policy_Async_Get_Cb callback, void *data) {
   AutoLock lock(lock_);
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
-      base::Bind(&TriggerHostPolicyGetCallbackAsyncOnUIThread, cookie_policy_,
-                 callback, data));
+  base::PostTask(FROM_HERE, {BrowserThread::UI},
+                 base::Bind(&TriggerHostPolicyGetCallbackAsyncOnUIThread,
+                            cookie_policy_, callback, data));
 }
 
 void CookieManager::GetHostNamesWithCookiesAsync(AsyncHostnamesGetCb callback, void *data) {
@@ -176,7 +174,7 @@ void CookieManager::GetHostNamesWithCookiesAsync(AsyncHostnamesGetCb callback, v
   host_callback_queue_.push(new EwkGetHostCallback(callback, data));
   std::unique_ptr<net::CookieStore> cookie_store = GetCookieStore();
   if (cookie_store.get()) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::Bind(&CookieManager::FetchCookiesOnIOThread, GetSharedThis(),
                    base::Passed(std::move(cookie_store))));
@@ -188,21 +186,18 @@ void CookieManager::FetchCookiesOnIOThread(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (cookie_store.get()) {
-    cookie_store->GetAllCookiesAsync(
-        base::BindOnce(&CookieManager::OnFetchComplete, GetSharedThis()));
+    cookie_store->GetAllCookiesAsync(base::BindOnce(
+        &CookieManager::OnFetchComplete, base::Unretained(this)));
   } else {
-    OnFetchComplete(net::CookieList(), net::CookieStatusList());
+    OnFetchComplete(net::CookieList());
   }
 }
 
-void CookieManager::OnFetchComplete(
-    const net::CookieList& cookies,
-    const net::CookieStatusList& excluded_cookies) {
+void CookieManager::OnFetchComplete(const net::CookieList& cookies) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::UI},
-        base::Bind(&CookieManager::OnFetchComplete, GetSharedThis(), cookies,
-                   excluded_cookies));
+    base::PostTask(FROM_HERE, {BrowserThread::UI},
+                   base::BindOnce(&CookieManager::OnFetchComplete,
+                                  base::Unretained(this), cookies));
     return;
   }
   if (!host_callback_queue_.empty()) {
@@ -237,14 +232,14 @@ bool CookieManager::ShouldBlockThirdPartyCookies() {
 }
 
 bool CookieManager::AllowCookies(const GURL& url,
-                                 const GURL& first_party_url,
+                                 const net::SiteForCookies& site_for_cookies,
                                  bool setting_cookie) {
   if (GetGlobalAllowAccess())
     return true;
 
   if (ShouldBlockThirdPartyCookies()) {
     net::StaticCookiePolicy policy(net::StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES);
-    return (policy.CanAccessCookies(url, first_party_url) == net::OK);
+    return (policy.CanAccessCookies(url, site_for_cookies) == net::OK);
   }
 
   return false;
@@ -267,7 +262,7 @@ bool CookieManager::AllowGetCookie(const GURL& url,
                                    content::ResourceContext* context,
                                    int render_process_id,
                                    int render_frame_id) {
-  return AllowCookies(url, first_party, false);
+  return AllowCookies(url, net::SiteForCookies::FromUrl(first_party), false);
 }
 
 bool CookieManager::AllowSetCookie(const GURL& url,
@@ -277,7 +272,7 @@ bool CookieManager::AllowSetCookie(const GURL& url,
                                    int render_process_id,
                                    int render_frame_id,
                                    const net::CookieOptions& options) {
-  return AllowCookies(url, first_party, true);
+  return AllowCookies(url, net::SiteForCookies::FromUrl(first_party), true);
 }
 
 static void SignalGetCookieValueCompleted(base::WaitableEvent* completion,
@@ -318,10 +313,10 @@ std::string CookieManager::GetCookiesForURL(const std::string& url) {
   std::string cookie_value;
   base::WaitableEvent completion(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                                  base::WaitableEvent::InitialState::NOT_SIGNALED);
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::IO},
-                           base::Bind(GetCookieValueOnIOThread,
-                                      base::Passed(std::move(cookie_store)),
-                                      GURL(url), &cookie_value, &completion));
+  base::PostTask(FROM_HERE, {BrowserThread::IO},
+                 base::Bind(GetCookieValueOnIOThread,
+                            base::Passed(std::move(cookie_store)), GURL(url),
+                            &cookie_value, &completion));
   // allow wait temporarily.
   completion.Wait();
   return cookie_value;
diff --git a/tizen_src/ewk/efl_integration/cookie_manager.h b/tizen_src/ewk/efl_integration/cookie_manager.h
index 6db806a..842cf87 100644
--- a/tizen_src/ewk/efl_integration/cookie_manager.h
+++ b/tizen_src/ewk/efl_integration/cookie_manager.h
@@ -98,12 +98,11 @@ class CookieManager : public base::RefCountedThreadSafe<CookieManager> {
   void DeleteSessionCookiesOnIOThread();
 
   bool AllowCookies(const GURL& url,
-                    const GURL& first_party_url,
+                    const net::SiteForCookies& site_for_cookies,
                     bool setting_cookie);
   // Fetch the cookies. This must be called in the IO thread.
   void FetchCookiesOnIOThread(std::unique_ptr<net::CookieStore> cookie_store);
-  void OnFetchComplete(const net::CookieList& cookies,
-                       const net::CookieStatusList& excluded_cookies);
+  void OnFetchComplete(const net::CookieList& cookies);
 
   scoped_refptr<CookieManager> GetSharedThis();
   scoped_refptr<content::URLRequestContextGetterEfl> GetContextGetter() const;
diff --git a/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc b/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc
index c88678c..d1f86c9 100644
--- a/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc
@@ -136,7 +136,7 @@ std::string DevToolsDelegateEfl::GetDiscoveryPageHTML() {
 }
 
 std::string DevToolsDelegateEfl::GetFrontendResource(const std::string& path) {
-  return content::DevToolsFrontendHost::GetFrontendResource(path).as_string();
+  return content::DevToolsFrontendHost::GetFrontendResource(path);
 }
 
 }  // namespace content
diff --git a/tizen_src/ewk/efl_integration/eweb_context.cc b/tizen_src/ewk/efl_integration/eweb_context.cc
index ed92fb1..f3079f1 100644
--- a/tizen_src/ewk/efl_integration/eweb_context.cc
+++ b/tizen_src/ewk/efl_integration/eweb_context.cc
@@ -27,7 +27,7 @@
 #include "net/proxy_resolution/proxy_config_service_fixed.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
 #include "storage/browser/database/database_quota_client.h"
-#include "storage/browser/fileapi/file_system_quota_client.h"
+#include "storage/browser/file_system/file_system_quota_client.h"
 #include "storage/browser/quota/quota_manager.h"
 #include "ui/gl/gl_shared_context_efl.h"
 
@@ -152,8 +152,8 @@ void OnTemporaryUsageAndQuotaObtained(
     // We still trigger callback.
     usage = 0;
   }
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                           base::Bind(callback, usage, user_data));
+  base::PostTask(FROM_HERE, {BrowserThread::UI},
+                 base::Bind(callback, usage, user_data));
 }
 
 void OnGetWebDBOrigins(Ewk_Web_Database_Origins_Get_Callback callback,
@@ -165,8 +165,8 @@ void OnGetWebDBOrigins(Ewk_Web_Database_Origins_Get_Callback callback,
     _Ewk_Security_Origin* sec_origin = new _Ewk_Security_Origin(*iter);
     origins = eina_list_append(origins, sec_origin);
   }
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                           base::Bind(callback, origins, user_data));
+  base::PostTask(FROM_HERE, {BrowserThread::UI},
+                 base::Bind(callback, origins, user_data));
 }
 
 void GetWebDBOriginsOnDBThread(Ewk_Web_Database_Origins_Get_Callback callback,
@@ -189,8 +189,8 @@ void OnGetFileSystemOrigins(Ewk_Local_File_System_Origins_Get_Callback callback,
     _Ewk_Security_Origin* sec_origin = new _Ewk_Security_Origin(*iter);
     origins = eina_list_append(origins, sec_origin);
   }
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                           base::Bind(callback, origins, user_data));
+  base::PostTask(FROM_HERE, {BrowserThread::UI},
+                 base::Bind(callback, origins, user_data));
 }
 
 void GetFileSystemOriginsOnFILEThread(
@@ -324,8 +324,10 @@ EWebContext::EWebContext(bool incognito, const std::string& injectedBundlePath)
   // there are ewk_cookie_manager APIs that can be called before a
   // WebView instance is created. In such circumstances, APIs including
   // ewk_cookie_manager_persistent_storage_set fail to execute.
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   BrowserContext::GetDefaultStoragePartition(browser_context())
       ->GetURLRequestContext();
+#endif
 
   // Notification Service gets init in BrowserMainRunner init,
   // so cache manager can register for notifications only after that.
@@ -408,6 +410,7 @@ Ewk_Cache_Model EWebContext::GetCacheModel() const {
 }
 
 void EWebContext::SetNetworkCacheEnable(bool enable) {
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   net::URLRequestContextGetter* url_context =
       BrowserContext::GetDefaultStoragePartition(browser_context())
           ->GetURLRequestContext();
@@ -427,9 +430,13 @@ void EWebContext::SetNetworkCacheEnable(bool enable) {
     http_cache->set_mode(net::HttpCache::NORMAL);
   else
     http_cache->set_mode(net::HttpCache::DISABLE);
+#endif
 }
 
 bool EWebContext::GetNetworkCacheEnable() const {
+#if defined(EWK_BRINGUP)  // FIXME: m85 bringup
+  return false;
+#else
   net::HttpCache* http_cache =
       BrowserContext::GetDefaultStoragePartition(browser_context())
           ->GetURLRequestContext()
@@ -440,6 +447,7 @@ bool EWebContext::GetNetworkCacheEnable() const {
     return false;
 
   return (http_cache->mode() != net::HttpCache::DISABLE);
+#endif
 }
 
 void EWebContext::AddExtraPluginDir(const char* path) {
@@ -496,12 +504,13 @@ void EWebContext::HTTPCustomHeaderClear() {
 }
 
 void EWebContext::SetProxyUri(const char* uri) {
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   proxy_uri_ = string(uri);
   net::ProxyConfig config;
   config.proxy_rules().ParseFromString(proxy_uri_);
   base::WaitableEvent done(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                            base::WaitableEvent::InitialState::NOT_SIGNALED);
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::Bind(&SetProxyConfigCallbackOnIOThread, &done,
                  base::RetainedRef(BrowserContext::GetDefaultStoragePartition(
@@ -509,6 +518,7 @@ void EWebContext::SetProxyUri(const char* uri) {
                                        ->GetURLRequestContext()),
                  config));
   done.Wait();
+#endif
 }
 
 void EWebContext::SetDidStartDownloadCallback(
@@ -531,9 +541,9 @@ Ewk_Cookie_Manager* EWebContext::ewkCookieManager() {
 
 void EWebContext::DeleteAllApplicationCache() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-    base::PostTaskWithTraits(FROM_HERE, {BrowserThread::IO},
-                             base::Bind(&EWebContext::DeleteAllApplicationCache,
-                                        base::Unretained(this)));
+    base::PostTask(FROM_HERE, {BrowserThread::IO},
+                   base::Bind(&EWebContext::DeleteAllApplicationCache,
+                              base::Unretained(this)));
     return;
   }
   BrowsingDataRemoverEfl* remover =
@@ -574,19 +584,18 @@ void EWebContext::GetApplicationCacheUsage(
   content::StoragePartition* partition =
       BrowserContext::GetStoragePartition(browser_context_.get(), NULL);
 
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::Bind(
-          &storage::QuotaManager::GetUsageAndQuota,
-          partition->GetQuotaManager(), url,
-          blink::mojom::StorageType::kTemporary,
-          base::Bind(&OnTemporaryUsageAndQuotaObtained, callback, user_data)));
+  base::PostTask(FROM_HERE, {BrowserThread::IO},
+                 base::Bind(&storage::QuotaManager::GetUsageAndQuota,
+                            partition->GetQuotaManager(), url,
+                            blink::mojom::StorageType::kTemporary,
+                            base::Bind(&OnTemporaryUsageAndQuotaObtained,
+                                       callback, user_data)));
 #endif
 }
 
 void EWebContext::WebStorageDelete() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::UI},
         base::Bind(&EWebContext::WebStorageDelete, base::Unretained(this)));
     return;
@@ -598,9 +607,9 @@ void EWebContext::WebStorageDelete() {
 
 void EWebContext::WebStorageDeleteForOrigin(const GURL& origin) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                             base::Bind(&EWebContext::WebStorageDeleteForOrigin,
-                                        base::Unretained(this), origin));
+    base::PostTask(FROM_HERE, {BrowserThread::UI},
+                   base::Bind(&EWebContext::WebStorageDeleteForOrigin,
+                              base::Unretained(this), origin));
     return;
   }
   content::StoragePartition* partition =
@@ -625,7 +634,7 @@ void EWebContext::WebStorageOriginsAllGet(
 
 void EWebContext::IndexedDBDelete() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::UI},
         base::Bind(&EWebContext::IndexedDBDelete, base::Unretained(this)));
     return;
@@ -637,7 +646,7 @@ void EWebContext::IndexedDBDelete() {
 
 void EWebContext::WebDBDelete(const GURL& host) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::UI},
         base::Bind(&EWebContext::WebDBDelete, base::Unretained(this), host));
     return;
@@ -661,9 +670,9 @@ void EWebContext::GetAllOriginsWithWebDB(
 
 void EWebContext::FileSystemDelete(const GURL& host) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                             base::Bind(&EWebContext::FileSystemDelete,
-                                        base::Unretained(this), host));
+    base::PostTask(FROM_HERE, {BrowserThread::UI},
+                   base::Bind(&EWebContext::FileSystemDelete,
+                              base::Unretained(this), host));
     return;
   }
   BrowsingDataRemoverEfl* remover =
@@ -718,7 +727,7 @@ Evas_Object* EWebContext::AddFaviconObject(const char* uri,
 void EWebContext::ClearCandidateData() {
 #if defined(TIZEN_AUTOFILL_SUPPORT)
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::UI},
         base::Bind(&EWebContext::ClearCandidateData, base::Unretained(this)));
     return;
diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index a9f8e7b..9256e6d 100644
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -34,7 +34,6 @@
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
-#include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/user_agent.h"
@@ -50,6 +49,7 @@
 #include "public/ewk_hit_test_internal.h"
 #include "services/network/public/cpp/resource_request_body.h"
 #include "skia/ext/platform_canvas.h"
+#include "third_party/blink/public/common/page/page_zoom.h"
 #include "third_party/blink/public/platform/web_string.h"
 #include "tizen/system_info.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -261,7 +261,7 @@ EWebView::~EWebView() {
   if (old_context_.get()) {
     Ewk_Context::Delete(context_.get());
     context_ = old_context_;
-    old_context_ = NULL;
+    old_context_ = nullptr;
   }
 
   GetPermissionPopupManager()->DeleteAllPermissionRequest();
@@ -436,13 +436,13 @@ void EWebView::SetTextZoomFactor(double text_zoom_factor) {
 }
 
 double EWebView::GetPageZoomFactor() const {
-  return content::ZoomLevelToZoomFactor(
+  return blink::PageZoomLevelToZoomFactor(
       content::HostZoomMap::GetZoomLevel(web_contents_.get()));
 }
 
 void EWebView::SetPageZoomFactor(double page_zoom_factor) {
   content::HostZoomMap::SetZoomLevel(
-      web_contents_.get(), content::ZoomFactorToZoomLevel(page_zoom_factor));
+      web_contents_.get(), blink::PageZoomFactorToZoomLevel(page_zoom_factor));
 }
 
 void EWebView::ExecuteEditCommand(const char* command, const char* value) {
@@ -716,8 +716,9 @@ bool EWebView::SetUserAgent(const char* userAgent) {
   for (int i = 0; i < controller.GetEntryCount(); ++i)
     controller.GetEntryAtIndex(i)->SetIsOverridingUserAgent(override);
   // TODO: Check if override_in_new_tabs has to be true.
-  web_contents_->SetUserAgentOverride(override ? userAgent : std::string(),
-                                      false /* override_in_new_tabs */);
+  web_contents_->SetUserAgentOverride(
+      blink::UserAgentOverride::UserAgentOnly(userAgent),
+      false /* override_in_new_tabs */);
   return true;
 }
 
@@ -739,7 +740,7 @@ bool EWebView::SetPrivateBrowsing(bool incognito) {
     web_contents_delegate_.reset();
     Ewk_Context::Delete(context_.get());
     context_ = old_context_;
-    old_context_ = NULL;
+    old_context_ = nullptr;
   } else {
     if (incognito) {
       old_context_ = context_;
@@ -761,8 +762,8 @@ void EWebView::set_magnifier(bool status) {
 }
 
 const char* EWebView::GetUserAgent() const {
-  if (!web_contents_->GetUserAgentOverride().empty())
-    user_agent_ = web_contents_->GetUserAgentOverride();
+  if (!web_contents_->GetUserAgentOverride().ua_string_override.empty())
+    user_agent_ = web_contents_->GetUserAgentOverride().ua_string_override;
 #if !defined(EWK_BRINGUP)  // FIXME: m73 bringup
   else
     user_agent_ = content::GetContentClientExport()->GetUserAgent();
@@ -1451,8 +1452,8 @@ void EWebView::SetQuotaPermissionRequestCallback(
 
 void EWebView::InvokeQuotaPermissionRequest(
     _Ewk_Quota_Permission_Request* request,
-    const content::QuotaPermissionContext::PermissionCallback& cb) {
-  quota_permission_request_map_[request] = cb;
+    content::QuotaPermissionContext::PermissionCallback cb) {
+  quota_permission_request_map_[request] = std::move(cb);
   request->setView(evas_object());
   if (quota_request_callback_.IsCallbackSet())
     quota_request_callback_.Run(evas_object(), request);
@@ -1465,15 +1466,10 @@ void EWebView::QuotaRequestReply(const _Ewk_Quota_Permission_Request* request,
   DCHECK(quota_permission_request_map_.find(request) !=
          quota_permission_request_map_.end());
 
-  QuotaPermissionContext::PermissionCallback cb =
-      quota_permission_request_map_[request];
-
-  if (allow)
-    QuotaPermissionContextEfl::DispatchCallback(
-        cb, QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_ALLOW);
-  else
-    QuotaPermissionContextEfl::DispatchCallback(
-        cb, QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_DISALLOW);
+  QuotaPermissionContextEfl::DispatchCallback(
+      std::move(quota_permission_request_map_[request]),
+      (allow ? QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_ALLOW
+             : QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_DISALLOW));
 
   quota_permission_request_map_.erase(request);
   delete request;
@@ -1484,10 +1480,9 @@ void EWebView::QuotaRequestCancel(
   DCHECK(quota_permission_request_map_.find(request) !=
          quota_permission_request_map_.end());
 
-  QuotaPermissionContext::PermissionCallback cb =
-      quota_permission_request_map_[request];
   QuotaPermissionContextEfl::DispatchCallback(
-      cb, QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_CANCELLED);
+      std::move(quota_permission_request_map_[request]),
+      QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_CANCELLED);
   quota_permission_request_map_.erase(request);
   delete request;
 }
@@ -1508,7 +1503,7 @@ void EWebView::SetLinkMagnifierEnabled(bool enabled) {
       enabled ? TAP_MULTIPLE_TARGETS_STRATEGY_POPUP
               : TAP_MULTIPLE_TARGETS_STRATEGY_NONE;
 #endif
-  web_contents_->GetRenderViewHost()->SyncRendererPrefs();
+  web_contents_->SyncRendererPrefs();
 }
 
 bool EWebView::GetSnapshotAsync(
@@ -2092,24 +2087,18 @@ void EWebView::InvokeWebProcessCrashedCallback() {
 }
 
 void EWebView::HandleRendererProcessCrash() {
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
-      base::Bind(&EWebView::InvokeWebProcessCrashedCallback,
-                 base::Unretained(this)));
+  base::PostTask(FROM_HERE, {BrowserThread::UI},
+                 base::Bind(&EWebView::InvokeWebProcessCrashedCallback,
+                            base::Unretained(this)));
 }
 
 void EWebView::InitializeContent() {
-  int width, height;
-  evas_object_geometry_get(evas_object_, 0, 0, &width, &height);
-
   WebContents* new_contents = create_new_window_web_contents_cb_.Run(this);
   if (!new_contents) {
     WebContents::CreateParams params(context_->browser_context());
-    params.initial_size = gfx::Size(width, height);
     web_contents_.reset(
         new WebContentsImplEfl(context_->browser_context(), this));
     static_cast<WebContentsImpl*>(web_contents_.get())->Init(params);
-    VLOG(1) << "Initial WebContents size: " << params.initial_size.ToString();
   } else {
     web_contents_.reset(new_contents);
 
@@ -2323,12 +2312,12 @@ void EWebView::HandleTapGestureForSelection(bool is_content_editable) {
 
 void EWebView::HandleZoomGesture(blink::WebGestureEvent& event) {
   blink::WebInputEvent::Type event_type = event.GetType();
-  if (event_type == blink::WebInputEvent::kGestureDoubleTap ||
-      event_type == blink::WebInputEvent::kGesturePinchBegin) {
+  if (event_type == blink::WebInputEvent::Type::kGestureDoubleTap ||
+      event_type == blink::WebInputEvent::Type::kGesturePinchBegin) {
     SmartCallback<EWebViewCallbacks::ZoomStarted>().call();
   }
-  if (event_type == blink::WebInputEvent::kGestureDoubleTap ||
-      event_type == blink::WebInputEvent::kGesturePinchEnd) {
+  if (event_type == blink::WebInputEvent::Type::kGestureDoubleTap ||
+      event_type == blink::WebInputEvent::Type::kGesturePinchEnd) {
     SmartCallback<EWebViewCallbacks::ZoomFinished>().call();
   }
 }
@@ -2337,10 +2326,9 @@ void EWebView::SendDelayedMessages(RenderViewHost* render_view_host) {
   DCHECK(render_view_host);
 
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::UI},
-        base::Bind(&EWebView::SendDelayedMessages, base::Unretained(this),
-                   render_view_host));
+    base::PostTask(FROM_HERE, {BrowserThread::UI},
+                   base::Bind(&EWebView::SendDelayedMessages,
+                              base::Unretained(this), render_view_host));
     return;
   }
 
diff --git a/tizen_src/ewk/efl_integration/eweb_view.h b/tizen_src/ewk/efl_integration/eweb_view.h
index 0e11dce..31d157b 100644
--- a/tizen_src/ewk/efl_integration/eweb_view.h
+++ b/tizen_src/ewk/efl_integration/eweb_view.h
@@ -24,11 +24,11 @@
 #include "browser/selectpicker/popup_picker.h"
 #include "content/browser/renderer_host/event_with_latency_info.h"
 #include "content/browser/selection/selection_controller_efl.h"
+#include "content/public/browser/context_menu_params.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/quota_permission_context.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_efl_delegate.h"
-#include "content/public/common/context_menu_params.h"
 #include "content/public/common/input_event_ack_state.h"
 #include "content/public/common/menu_item.h"
 #include "context_menu_controller_efl.h"
@@ -444,7 +444,7 @@ class EWebView {
       void* user_data);
   void InvokeQuotaPermissionRequest(
       _Ewk_Quota_Permission_Request* request,
-      const content::QuotaPermissionContext::PermissionCallback& cb);
+      content::QuotaPermissionContext::PermissionCallback cb);
   void QuotaRequestReply(const _Ewk_Quota_Permission_Request* request,
                          bool allow);
   void QuotaRequestCancel(const _Ewk_Quota_Permission_Request* request);
diff --git a/tizen_src/ewk/efl_integration/ewk_global_data.cc b/tizen_src/ewk/efl_integration/ewk_global_data.cc
index 1a83e46..a2580fa 100644
--- a/tizen_src/ewk/efl_integration/ewk_global_data.cc
+++ b/tizen_src/ewk/efl_integration/ewk_global_data.cc
@@ -6,7 +6,6 @@
 
 #include "base/cpu.h"
 #include "base/logging.h"
-#include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_pump_for_ui_efl.h"
 #include "base/path_service.h"
 #include "browser/autofill/personal_data_manager_factory.h"
@@ -41,7 +40,6 @@
 void* EflExtensionHandle = 0;
 #endif
 
-using base::MessageLoop;
 using content::BrowserMainRunner;
 using content::BrowserThread;
 using content::ContentMainDelegateEfl;
@@ -67,7 +65,7 @@ EwkGlobalData::EwkGlobalData()
 EwkGlobalData::~EwkGlobalData() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // URLRequestContextGetterEfl needs to be deleted before loop stops
-  system_request_context_ = NULL;
+  system_request_context_ = nullptr;
 
 // MessageLoop::QuitNow is deprecated. Should use RunLoop::Quit()
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
diff --git a/tizen_src/ewk/efl_integration/ipc_message_start_ewk.h b/tizen_src/ewk/efl_integration/ipc_message_start_ewk.h
index c0c9203..0ae0318 100644
--- a/tizen_src/ewk/efl_integration/ipc_message_start_ewk.h
+++ b/tizen_src/ewk/efl_integration/ipc_message_start_ewk.h
@@ -6,4 +6,4 @@
 
 // Ideally we should add our own unique ID for EWK messages. However, in order
 // to minimize chromium changes let's hijack ID used by content_shell app.
-#define EwkMsgStart BlinkTestMsgStart
+#define EwkMsgStart WebTestMsgStart
diff --git a/tizen_src/ewk/efl_integration/locale_efl.cc b/tizen_src/ewk/efl_integration/locale_efl.cc
index ef91d1c..873a4cf 100644
--- a/tizen_src/ewk/efl_integration/locale_efl.cc
+++ b/tizen_src/ewk/efl_integration/locale_efl.cc
@@ -8,12 +8,13 @@
 #include <string>
 #include <unistd.h>
 
-#include "base/files/file_path.h"
 #include "base/command_line.h"
+#include "base/files/file_path.h"
+#include "base/logging.h"
 #include "base/path_service.h"
+#include "content/common/paths_efl.h"
 #include "content/public/common/content_switches.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "content/common/paths_efl.h"
 
 #if defined(OS_TIZEN)
 #include <vconf/vconf.h>
diff --git a/tizen_src/ewk/efl_integration/network_delegate_efl.cc b/tizen_src/ewk/efl_integration/network_delegate_efl.cc
index 600e552..a888080 100644
--- a/tizen_src/ewk/efl_integration/network_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/network_delegate_efl.cc
@@ -15,6 +15,7 @@ NetworkDelegateEfl::NetworkDelegateEfl(
     base::WeakPtr<CookieManager> cookie_manager)
     : cookie_manager_(cookie_manager) {}
 
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
 NetworkDelegate::AuthRequiredResponse NetworkDelegateEfl::OnAuthRequired(
     URLRequest* request,
     const AuthChallengeInfo& auth_info,
@@ -22,13 +23,13 @@ NetworkDelegate::AuthRequiredResponse NetworkDelegateEfl::OnAuthRequired(
     AuthCredentials* credentials) {
   return AUTH_REQUIRED_RESPONSE_NO_ACTION;
 }
+#endif
 
 bool NetworkDelegateEfl::OnCanGetCookies(const URLRequest& request,
-                                         const CookieList& cookie_list,
                                          bool allowed_from_caller) {
   if (!cookie_manager_.get())
     return false;
-  return cookie_manager_->OnCanGetCookies(request, cookie_list);
+  return cookie_manager_->OnCanGetCookies(request, CookieList());
 }
 
 bool NetworkDelegateEfl::OnCanSetCookie(const URLRequest& request,
diff --git a/tizen_src/ewk/efl_integration/network_delegate_efl.h b/tizen_src/ewk/efl_integration/network_delegate_efl.h
index eaa4581..abe42ec 100644
--- a/tizen_src/ewk/efl_integration/network_delegate_efl.h
+++ b/tizen_src/ewk/efl_integration/network_delegate_efl.h
@@ -18,13 +18,14 @@ class NetworkDelegateEfl : public NetworkDelegateImpl {
 
  private:
   // NetworkDelegate implementation.
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   AuthRequiredResponse OnAuthRequired(URLRequest* request,
                                       const AuthChallengeInfo& auth_info,
                                       AuthCallback callback,
                                       AuthCredentials* credentials) override;
+#endif
 
   bool OnCanGetCookies(const URLRequest& request,
-                       const CookieList& cookie_list,
                        bool allowed_from_caller) override;
 
   bool OnCanSetCookie(const URLRequest& request,
@@ -34,7 +35,7 @@ class NetworkDelegateEfl : public NetworkDelegateImpl {
 
   bool OnCanAccessFile(const URLRequest& request,
                        const base::FilePath& original_path,
-                       const base::FilePath& absolute_path) const override;
+                       const base::FilePath& absolute_path) const;
 
   base::WeakPtr<CookieManager> cookie_manager_;
 };
diff --git a/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc b/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc
index 04ffed9..85a6b34 100644
--- a/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc
+++ b/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc
@@ -25,7 +25,6 @@ void FreeStringShare(void* data) {
 
 _Ewk_Policy_Decision::_Ewk_Policy_Decision(const GURL& request_url,
                                            net::URLRequest* request,
-                                           content::ResourceType resource_type,
                                            PolicyResponseDelegateEfl* delegate)
     : web_view_(NULL),
       policy_response_delegate_(delegate),
diff --git a/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.h b/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.h
index c61a445..0e37d24 100644
--- a/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.h
@@ -14,10 +14,7 @@
 #include "browser/navigation_policy_handler_efl.h"
 #include "browser/policy_response_delegate_efl.h"
 #include "content/public/browser/web_contents_efl_delegate.h"
-#include "content/public/common/resource_type.h"
 #include "public/ewk_policy_decision.h"
-// FIXME: removed on m63
-//#include "third_party/blink/public/web/WebViewModeEnums.h"
 
 // Basic type of authorization - 'type username:password'
 #define BASIC_AUTHORIZATION "BASIC"
@@ -43,7 +40,6 @@ class _Ewk_Policy_Decision {
   */
   explicit _Ewk_Policy_Decision(const GURL& request_url,
                                 net::URLRequest* request,
-                                content::ResourceType resource_type,
                                 PolicyResponseDelegateEfl* delegate);
 
  /**
diff --git a/tizen_src/ewk/efl_integration/public/ewk_view.cc b/tizen_src/ewk/efl_integration/public/ewk_view.cc
index f0033ba..b959740 100644
--- a/tizen_src/ewk/efl_integration/public/ewk_view.cc
+++ b/tizen_src/ewk/efl_integration/public/ewk_view.cc
@@ -32,21 +32,20 @@
 #include "eweb_view.h"
 #include "geolocation_permission_popup.h"
 #include "notification_permission_popup.h"
-#include "public/ewk_back_forward_list.h"
-#include "public/ewk_context.h"
-#include "public/ewk_enums_internal.h"
-#include "public/ewk_settings.h"
+#include "private/ewk_back_forward_list_private.h"
 #include "private/ewk_context_private.h"
 #include "private/ewk_frame_private.h"
+#include "private/ewk_history_private.h"
 #include "private/ewk_hit_test_private.h"
 #include "private/ewk_notification_private.h"
 #include "private/ewk_private.h"
 #include "private/ewk_quota_permission_request_private.h"
-#include "private/ewk_back_forward_list_private.h"
-#include "private/ewk_history_private.h"
 #include "private/ewk_view_private.h"
-// FIXME: removed on m63
-//#include "third_party/blink/public/web/WebViewModeEnums.h"
+#include "public/ewk_back_forward_list.h"
+#include "public/ewk_context.h"
+#include "public/ewk_enums_internal.h"
+#include "public/ewk_settings.h"
+#include "third_party/blink/public/common/page/page_zoom.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 #include "url/gurl.h"
 #include "usermedia_permission_popup.h"
@@ -436,7 +435,7 @@ Evas_Object* ewk_view_screenshot_contents_get(const Evas_Object* view, Eina_Rect
   EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, NULL);
   EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, NULL);
   // Zoom level equality (<=0.001) is sufficient compared to high precision std::numeric_value::epsilon.
-  if (!content::ZoomValuesEqual(scale_factor, 1.0)) {
+  if (!blink::PageZoomValuesEqual(scale_factor, 1.0)) {
     LOG(ERROR) << "We only support scale factor of 1.0."
                << "Scaling option will be supported after hardware acceleration is enabled.";
     return NULL;
@@ -450,7 +449,7 @@ Eina_Bool ewk_view_screenshot_contents_get_async(const Evas_Object* view, Eina_R
   EINA_SAFETY_ON_NULL_RETURN_VAL(callback, EINA_FALSE);
   EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, EINA_FALSE);
   // Zoom level equality (<=0.001) is sufficient compared to high precision std::numeric_value::epsilon.
-  if (!content::ZoomValuesEqual(scale_factor, 1.0)) {
+  if (!blink::PageZoomValuesEqual(scale_factor, 1.0)) {
     LOG(ERROR) << "We only support scale factor of 1.0."
                << "Scaling option will be supported after hardware acceleration is enabled.";
     return EINA_FALSE;
diff --git a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
index 33d30d9..6baa3cd 100644
--- a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
@@ -13,9 +13,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "common/content_switches_efl.h"
 #include "common/render_messages_ewk.h"
-#include "components/visitedlink/renderer/visitedlink_slave.h"
+#include "components/visitedlink/renderer/visitedlink_reader.h"
 #include "content/common/paths_efl.h"
-#include "content/public/common/url_loader_throttle.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
@@ -125,11 +124,7 @@ void ContentRendererClientEfl::RenderThreadStarted() {
   render_thread_observer_.reset(new RenderThreadObserverEfl(this));
   thread->AddObserver(render_thread_observer_.get());
 
-  visited_link_slave_.reset(new visitedlink::VisitedLinkSlave());
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  // FIXME: EWK_BRINGUP definition should be removed.
-  thread->AddObserver(visited_link_slave_.get());
-#endif  // !defined(EWK_BRINGUP)
+  visited_link_reader_.reset(new visitedlink::VisitedLinkReader);
 }
 
 void ContentRendererClientEfl::RenderFrameCreated(content::RenderFrame* render_frame) {
@@ -174,12 +169,14 @@ bool ContentRendererClientEfl::OverrideCreatePlugin(
 #endif
 }
 
-void ContentRendererClientEfl::WillSendRequest(blink::WebLocalFrame* frame,
-                                               ui::PageTransition transition_type,
-                                               const blink::WebURL& url,
-                                               const url::Origin* initiator_origin,
-                                               GURL* new_url,
-                                               bool* attach_same_site_cookies) {}
+void ContentRendererClientEfl::WillSendRequest(
+    blink::WebLocalFrame* frame,
+    ui::PageTransition transition_type,
+    const blink::WebURL& url,
+    const net::SiteForCookies& site_for_cookies,
+    const url::Origin* initiator_origin,
+    GURL* new_url,
+    bool* attach_same_site_cookies) {}
 
 void ContentRendererClientEfl::DidCreateScriptContext(
     blink::WebFrame* frame,
@@ -254,11 +251,11 @@ bool ContentRendererClientEfl::HandleNavigation(
 
 uint64_t ContentRendererClientEfl::VisitedLinkHash(const char* canonical_url,
                                                    size_t length) {
-  return visited_link_slave_->ComputeURLFingerprint(canonical_url, length);
+  return visited_link_reader_->ComputeURLFingerprint(canonical_url, length);
 }
 
 bool ContentRendererClientEfl::IsLinkVisited(uint64_t link_hash) {
-  return visited_link_slave_->IsVisited(link_hash);
+  return visited_link_reader_->IsVisited(link_hash);
 }
 
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
@@ -324,16 +321,6 @@ void ContentRendererClientEfl::GetNavigationErrorStrings(
 }
 #endif
 
-std::unique_ptr<blink::WebSpeechSynthesizer>
-ContentRendererClientEfl::OverrideSpeechSynthesizer(
-    blink::WebSpeechSynthesizerClient* client) {
-#if defined(TIZEN_MULTIMEDIA_SUPPORT)
-  return base::MakeUnique<TtsDispatcher>(new content::TtsDispatcherEfl(client));
-#else
-  return nullptr;
-#endif
-}
-
 void ContentRendererClientEfl::ApplyCustomMobileSettings(blink::WebView* webview) {
   // blink::WebViewImpl prevents auto zoom after tap if maximum legible scale is
   // too small. Blink by default sets it to 1 and needs to be enlarged to make
diff --git a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h
index e3799ba..8e0c0fe 100644
--- a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h
+++ b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h
@@ -5,10 +5,8 @@
 #ifndef CONTENT_RENDERER_CLIENT_EFL_H
 #define CONTENT_RENDERER_CLIENT_EFL_H
 
-#include "content/public/common/url_loader_throttle.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/render_frame_observer.h"
-#include "renderer/content_renderer_client_efl.h"
 #include "renderer/render_thread_observer_efl.h"
 #include "v8/include/v8.h"
 
@@ -23,7 +21,7 @@ class DocumentState;
 }
 
 namespace visitedlink {
-class VisitedLinkSlave;
+class VisitedLinkReader;
 }
 
 class Ewk_Wrt_Message_Data;
@@ -34,7 +32,7 @@ class WrtUrlParseImpl;
 class ContentRendererClientEfl : public content::ContentRendererClient {
  public:
   ContentRendererClientEfl();
-  ~ContentRendererClientEfl();
+  ~ContentRendererClientEfl() override;
 
   void RenderThreadStarted() override;
 
@@ -69,6 +67,7 @@ class ContentRendererClientEfl : public content::ContentRendererClient {
   void WillSendRequest(blink::WebLocalFrame* frame,
                        ui::PageTransition transition_type,
                        const blink::WebURL& url,
+                       const net::SiteForCookies& site_for_cookies,
                        const url::Origin* initiator_origin,
                        GURL* new_url,
                        bool* attach_same_site_cookies) override;
@@ -95,16 +94,13 @@ class ContentRendererClientEfl : public content::ContentRendererClient {
 
   bool IsLinkVisited(uint64_t link_hash) override;
 
-  std::unique_ptr<blink::WebSpeechSynthesizer> OverrideSpeechSynthesizer(
-      blink::WebSpeechSynthesizerClient* client) override;
-
  private:
   static void ApplyCustomMobileSettings(blink::WebView*);
 
   std::unique_ptr<V8Widget> widget_;
   std::unique_ptr<WrtUrlParseImpl> wrt_url_parser_;
   std::unique_ptr<RenderThreadObserverEfl> render_thread_observer_;
-  std::unique_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_;
+  std::unique_ptr<visitedlink::VisitedLinkReader> visited_link_reader_;
   bool javascript_can_open_windows_;
 };
 
diff --git a/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc b/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc
index 67d494d..f385af9 100644
--- a/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc
@@ -101,10 +101,10 @@ void PrintWebViewHelperEfl::InitPrintSettings(int width, int height, bool fit_to
   settings.pages.clear();
 
   settings.params.print_scaling_option =
-      blink::kWebPrintScalingOptionSourceSize;
+      printing::mojom::PrintScalingOption::kSourceSize;
   if (fit_to_paper_size) {
     settings.params.print_scaling_option =
-        blink::kWebPrintScalingOptionFitToPrintableArea;
+        printing::mojom::PrintScalingOption::kFitToPrintableArea;
   }
 
   print_pages_params_.reset(new PrintPagesParams(settings));
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 b913369..3d385b7 100644
--- a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
@@ -19,7 +19,6 @@
 #include "content/renderer/render_frame_impl.h"
 #undef private
 #include "common/render_messages_ewk.h"
-#include "content/renderer/external_popup_menu.h"
 #include "renderer/content_renderer_client_efl.h"
 #include "third_party/blink/public/platform/url_conversion.h"
 #include "third_party/blink/public/platform/web_url_error.h"
diff --git a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc
index f536c7f..0919815 100644
--- a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc
@@ -16,16 +16,12 @@
 #include "common/render_messages_ewk.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/render_view.h"
-//#include "third_party/blink/public/platform/WebCString.h"
-#include "third_party/blink/public/platform/web_content_security_policy.h"
+#include "third_party/blink/public/common/input/web_input_event.h"
 #include "third_party/blink/public/platform/web_data.h"
-#include "third_party/blink/public/platform/web_input_event.h"
-#include "third_party/blink/public/platform/web_point.h"
 #include "third_party/blink/public/platform/web_size.h"
 #include "third_party/blink/public/platform/web_string.h"
 #include "third_party/blink/public/platform/web_url_error.h"
 #include "third_party/blink/public/platform/web_url_request.h"
-//#include "third_party/blink/public/web/WebDataSource.h"
 #include "third_party/blink/public/web/web_document.h"
 #include "third_party/blink/public/web/web_form_element.h"
 #include "third_party/blink/public/web/web_frame.h"
@@ -45,7 +41,7 @@ using blink::WebURLRequest;
 
 namespace {
 
-typedef blink::mojom::ContentSecurityPolicyType SecurityPolicyType;
+typedef network::mojom::ContentSecurityPolicyType SecurityPolicyType;
 
 static_assert(static_cast<int>(SecurityPolicyType::kReport) ==
                   static_cast<int>(EWK_REPORT_ONLY),
@@ -630,6 +626,6 @@ void RenderViewObserverEfl::OnSetTextZoomFactor(float zoom_factor) {
   // Hide selection and autofill popups.
 #if !defined(EWK_BRINGUP)  // FIXME: m73 bringup
   view->HidePopups();
-#endif
   view->SetTextZoomFactor(zoom_factor);
+#endif
 }
diff --git a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h
index 3532a4d..2e1c431 100644
--- a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h
+++ b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h
@@ -54,7 +54,7 @@ class RenderViewObserverEfl: public content::RenderViewObserver {
   //So using this notification to update minimum and maximum page scale factor values
   virtual void DidUpdateLayout();
 
-  void DidHandleGestureEvent(const blink::WebGestureEvent& event) override;
+  void DidHandleGestureEvent(const blink::WebGestureEvent& event);
 
  private:
   void OnSetContentSecurityPolicy(const std::string& policy, Ewk_CSP_Header_Type header_type);
diff --git a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc
index 9f37947..30cdb96 100644
--- a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc
+++ b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc
@@ -25,13 +25,11 @@
 #include "net/extras/sqlite/sqlite_persistent_cookie_store.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
-#include "net/http/http_server_properties_impl.h"
+#include "net/http/http_server_properties.h"
+#include "net/proxy_resolution/configured_proxy_resolution_service.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
 #include "net/ssl/ssl_config_service_defaults.h"
-#include "net/url_request/data_protocol_handler.h"
-#include "net/url_request/file_protocol_handler.h"
 #include "net/url_request/static_http_user_agent_settings.h"
-#include "net/url_request/url_request_intercepting_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "network_delegate_efl.h"
 #include "wrt/wrt_file_protocol_handler.h"
@@ -79,7 +77,7 @@ URLRequestContextGetterEfl::URLRequestContextGetterEfl(
     std::swap(protocol_handlers_, *protocol_handlers);
 
   proxy_config_service_ =
-      net::ProxyResolutionService::CreateSystemProxyConfigService(
+      net::ConfiguredProxyResolutionService::CreateSystemProxyConfigService(
           io_task_runner);
 }
 
@@ -130,26 +128,28 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
 
     // TODO(jam): use v8 if possible, look at chrome code.
     storage_->set_proxy_resolution_service(
-        net::ProxyResolutionService::CreateUsingSystemProxyResolver(
-            std::move(proxy_config_service_), url_request_context_->net_log()));
+        net::ConfiguredProxyResolutionService::CreateUsingSystemProxyResolver(
+            std::move(proxy_config_service_), url_request_context_->net_log(),
+            /*quick_check_enabled=*/true));
 
     storage_->set_ssl_config_service(
         std::make_unique<net::SSLConfigServiceDefaults>());
     storage_->set_http_auth_handler_factory(
         net::HttpAuthHandlerRegistryFactory::CreateDefault());
     storage_->set_http_server_properties(
-        std::unique_ptr<net::HttpServerProperties>(
-            new net::HttpServerPropertiesImpl()));
+        std::make_unique<net::HttpServerProperties>());
 
     net::HttpCache::DefaultBackend* main_backend = NULL;
     if (base_path_.empty()) {
       main_backend = new net::HttpCache::DefaultBackend(
-          net::MEMORY_CACHE, net::CACHE_BACKEND_DEFAULT, base::FilePath(), 0);
+          net::MEMORY_CACHE, net::CACHE_BACKEND_DEFAULT, base::FilePath(),
+          /*max_bytes=*/0, /*hard_reset=*/false);
     } else {
       base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
 
       main_backend = new net::HttpCache::DefaultBackend(
-          net::DISK_CACHE, net::CACHE_BACKEND_DEFAULT, cache_path, 0);
+          net::DISK_CACHE, net::CACHE_BACKEND_DEFAULT, cache_path,
+          /*max_bytes=*/0, /*hard_reset=*/false);
     }
 
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
@@ -222,6 +222,7 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
     // Keep ProtocolHandlers added in sync with
     // ShellContentBrowserClient::IsHandledURL().
     InstallProtocolHandlers(job_factory.get(), &protocol_handlers_);
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
     bool set_protocol = job_factory->SetProtocolHandler(
         url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler));
     DCHECK(set_protocol);
@@ -238,6 +239,7 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
                  base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN})
                 .get())));
     DCHECK(set_protocol);
+#endif
 
     // Set up interceptors in the reverse order.
     std::unique_ptr<net::URLRequestJobFactory> top_job_factory =
@@ -245,8 +247,10 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
     for (URLRequestInterceptorScopedVector::reverse_iterator i =
              request_interceptors_.rbegin();
          i != request_interceptors_.rend(); ++i) {
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
       top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
           std::move(top_job_factory), std::move(*i)));
+#endif
     }
     request_interceptors_.clear();
 
@@ -258,7 +262,7 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
 
 scoped_refptr<base::SingleThreadTaskRunner>
 URLRequestContextGetterEfl::GetNetworkTaskRunner() const {
-  return base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::IO});
+  return base::CreateSingleThreadTaskRunner({BrowserThread::IO});
 }
 
 net::HostResolver* URLRequestContextGetterEfl::host_resolver() {
@@ -275,7 +279,7 @@ void URLRequestContextGetterEfl::SetCookieStoragePath(
   }
 
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::Bind(&URLRequestContextGetterEfl::SetCookieStoragePath, this,
                    path, persist_session_cookies, file_storage));
@@ -309,12 +313,11 @@ void URLRequestContextGetterEfl::CreateSQLitePersistentCookieStore(
   if (base::DirectoryExists(path) || base::CreateDirectory(path)) {
     const base::FilePath& cookie_path = path.AppendASCII("Cookies");
     persistent_store = new net::SQLitePersistentCookieStore(
-        cookie_path,
-        base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::IO}),
+        cookie_path, base::CreateSingleThreadTaskRunner({BrowserThread::IO}),
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
         BrowserThread::GetTaskRunnerForThread(BrowserThread::DB),
 #else
-        base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI}),
+        base::CreateSingleThreadTaskRunner({BrowserThread::UI}),
 #endif
         persist_session_cookies, NULL);
   } else {
@@ -349,8 +352,7 @@ void URLRequestContextGetterEfl::CreatePersistentCookieStore(
   cookie_store_path_ = path;
 
   CookieStoreConfig config(
-      cookie_store_path_.Append(FILE_PATH_LITERAL("Cookies")), false, false,
-      nullptr);
+      cookie_store_path_.Append(FILE_PATH_LITERAL("Cookies")), false, false);
   cookie_store_ = CreateCookieStore(config, net_log_);
   net::CookieMonster* cookie_monster =
       static_cast<net::CookieMonster*>(cookie_store_.get());
diff --git a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h
index 1549778..9d43645 100644
--- a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h
+++ b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h
@@ -34,9 +34,9 @@ class URLRequestContextGetterEfl : public net::URLRequestContextGetter {
       bool ignore_certificate_errors = false,
       const base::FilePath& base_path = base::FilePath(),
       const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner =
-          base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::IO}),
+          base::CreateSingleThreadTaskRunner({BrowserThread::IO}),
       const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner =
-          base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI}),
+          base::CreateSingleThreadTaskRunner({BrowserThread::UI}),
       ProtocolHandlerMap* protocol_handlers = NULL,
       URLRequestInterceptorScopedVector request_interceptors =
           URLRequestInterceptorScopedVector(),
diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
index b4e9d4c..863985f 100644
--- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
@@ -10,6 +10,7 @@
 #include "browser/javascript_dialog_manager_efl.h"
 #include "browser/policy_response_delegate_efl.h"
 #include "common/render_messages_ewk.h"
+#include "components/favicon/core/favicon_url.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/prefs/pref_service.h"
@@ -21,7 +22,6 @@
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_entry.h"
-#include "content/public/common/favicon_url.h"
 #include "eweb_view.h"
 #include "eweb_view_callbacks.h"
 #include "net/base/load_states.h"
@@ -34,7 +34,7 @@
 #include "private/ewk_policy_decision_private.h"
 #include "private/ewk_user_media_private.h"
 #include "private/webview_delegate_ewk.h"
-#include "third_party/blink/public/platform/web_input_event.h"
+#include "third_party/blink/public/common/input/web_input_event.h"
 #include "url/gurl.h"
 
 #if defined(TIZEN_MULTIMEDIA_SUPPORT)
@@ -74,9 +74,9 @@ void WritePdfDataToFile(printing::MetafileSkia* metafile,
 }
 
 #if defined(OS_TIZEN) && defined(TIZEN_MULTIMEDIA_SUPPORT)
-static const content::MediaStreamDevice* GetRequestedVideoDevice(
+static const MediaStreamDevice* GetRequestedVideoDevice(
     const std::string& device_id) {
-  const content::MediaStreamDevices& video_devices =
+  const MediaStreamDevices& video_devices =
       MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices();
   if (video_devices.empty())
     return NULL;
@@ -118,7 +118,7 @@ WebContentsDelegateEfl::~WebContentsDelegateEfl() {
 
 WebContents* WebContentsDelegateEfl::OpenURLFromTab(
     WebContents* source,
-    const content::OpenURLParams& params) {
+    const OpenURLParams& params) {
   const GURL& url = params.url;
   WindowOpenDisposition disposition = params.disposition;
 
@@ -156,7 +156,7 @@ WebContents* WebContentsDelegateEfl::OpenURLFromTab(
 void WebContentsDelegateEfl::NavigationStateChanged(
     WebContents* source,
     InvalidateTypes changed_flags) {
-  if (changed_flags & content::INVALIDATE_TYPE_URL) {
+  if (changed_flags & INVALIDATE_TYPE_URL) {
     const char* url = source->GetVisibleURL().spec().c_str();
     web_view_->SmartCallback<EWebViewCallbacks::URLChanged>().call(url);
     web_view_->SmartCallback<EWebViewCallbacks::URIChanged>().call(url);
@@ -178,18 +178,18 @@ void WebContentsDelegateEfl::LoadProgressChanged(WebContents* source,
 }
 
 bool WebContentsDelegateEfl::ShouldCreateWebContents(
-    content::WebContents* web_contents,
-    content::RenderFrameHost* opener,
-    content::SiteInstance* source_site_instance,
+    WebContents* web_contents,
+    RenderFrameHost* opener,
+    SiteInstance* source_site_instance,
     int32_t route_id,
     int32_t main_frame_route_id,
     int32_t main_frame_widget_route_id,
-    content::mojom::WindowContainerType window_container_type,
+    mojom::WindowContainerType window_container_type,
     const GURL& opener_url,
     const std::string& frame_name,
     const GURL& target_url,
     const std::string& partition_id,
-    content::SessionStorageNamespace* session_storage_namespace) {
+    SessionStorageNamespace* session_storage_namespace) {
   // We implement the asynchronous version of the function, this
   // one should never be invoked.
   NOTREACHED();
@@ -201,21 +201,20 @@ void WebContentsDelegateEfl::CloseContents(WebContents* source) {
 }
 
 void WebContentsDelegateEfl::EnterFullscreenModeForTab(
-    content::WebContents* web_contents,
-    const GURL& origin,
-    const blink::WebFullscreenOptions& options) {
+    RenderFrameHost* requesting_frame,
+    const blink::mojom::FullscreenOptions& options) {
   is_fullscreen_ = true;
   web_view_->SmartCallback<EWebViewCallbacks::EnterFullscreen>().call();
 }
 
 void WebContentsDelegateEfl::ExitFullscreenModeForTab(
-    content::WebContents* web_contents) {
+    WebContents* web_contents) {
   is_fullscreen_ = false;
   web_view_->SmartCallback<EWebViewCallbacks::ExitFullscreen>().call();
 }
 
 bool WebContentsDelegateEfl::IsFullscreenForTabOrPending(
-    const WebContents* web_contents) const {
+    const WebContents* web_contents) {
   return is_fullscreen_;
 }
 
@@ -247,14 +246,14 @@ void WebContentsDelegateEfl::RequestMediaAccessAllow(
     MediaResponseCallback callback) {
   MediaStreamDevices devices;
 
-  if (request.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE) {
+  if (request.audio_type == MEDIA_DEVICE_AUDIO_CAPTURE) {
     devices.push_back(
         MediaStreamDevice(request.audio_type, "default", "Default"));
   }
 
-  if (request.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE) {
+  if (request.video_type == MEDIA_DEVICE_VIDEO_CAPTURE) {
 #if defined(OS_TIZEN)
-    const content::MediaStreamDevice* video_device =
+    const MediaStreamDevice* video_device =
         GetRequestedVideoDevice(request.requested_video_device_id);
     if (video_device) {
       devices.push_back(*video_device);
@@ -390,21 +389,20 @@ void WebContentsDelegateEfl::DidFinishLoad(RenderFrameHost* render_frame_host,
 }
 
 void WebContentsDelegateEfl::DidUpdateFaviconURL(
-    const std::vector<FaviconURL>& candidates) {
+    RenderFrameHost* render_frame_host,
+    const std::vector<blink::mojom::FaviconURLPtr>& candidates) {
   // select and set proper favicon
-  for (unsigned int i = 0; i < candidates.size(); ++i) {
-    FaviconURL favicon = candidates[i];
-    if (favicon.icon_type == FaviconURL::IconType::kFavicon &&
-        !favicon.icon_url.is_empty()) {
+  for (const auto& favicon : candidates) {
+    if (favicon->icon_type == blink::mojom::FaviconIconType::kFavicon &&
+        !favicon->icon_url.is_valid()) {
       NavigationEntry* entry = web_contents_.GetController().GetVisibleEntry();
       if (!entry)
         return;
-      entry->GetFavicon().url = favicon.icon_url;
+      entry->GetFavicon().url = favicon->icon_url;
       entry->GetFavicon().valid = true;
       return;
     }
   }
-  return;
 }
 
 void WebContentsDelegateEfl::DidDownloadFavicon(bool success,
@@ -423,7 +421,6 @@ void WebContentsDelegateEfl::RequestCertificateConfirm(
     int cert_error,
     const net::SSLInfo& ssl_info,
     const GURL& url,
-    ResourceType /*resource_type*/,
     bool /*overridable*/,
     bool /*strict_enforcement*/,
     base::Callback<void(CertificateRequestResultType)>& callback) {
@@ -433,7 +430,7 @@ void WebContentsDelegateEfl::RequestCertificateConfirm(
   std::string pem_certificate;
   if (!net::X509Certificate::GetPEMEncoded(ssl_info.cert->os_cert_handle(),
                                            &pem_certificate)) {
-    *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL;
+    *result = CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL;
     return;
   }
   certificate_policy_decision_.reset(new _Ewk_Certificate_Policy_Decision(
@@ -536,17 +533,14 @@ void WebContentsDelegateEfl::DidFailProvisionalLoad(
     int error_code,
     const base::string16& error_description,
     bool /*was_ignored_by_handler*/) {
-  DidFailLoad(render_frame_host, validated_url, error_code, error_description);
+  DidFailLoad(render_frame_host, validated_url, error_code);
 }
 
-void WebContentsDelegateEfl::DidFailLoad(
-    RenderFrameHost* render_frame_host,
-    const GURL& validated_url,
-    int error_code,
-    const base::string16& error_description) {
+void WebContentsDelegateEfl::DidFailLoad(RenderFrameHost* render_frame_host,
+                                         const GURL& validated_url,
+                                         int error_code) {
   bool is_main_frame = !render_frame_host->GetParent();
-  std::string description = base::UTF16ToUTF8(error_description);
-  web_view_->InvokeLoadError(validated_url, error_code, description,
+  web_view_->InvokeLoadError(validated_url, error_code, std::string(),
                              is_main_frame);
 }
 
@@ -606,6 +600,7 @@ void WebContentsDelegateEfl::OnGetContentSecurityPolicy(
 
 void WebContentsDelegateEfl::OnPrintedMetafileReceived(
     const DidPrintPagesParams& params) {
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   base::SharedMemory shared_buf(params.metafile_data_handle, true);
   if (!shared_buf.Map(params.data_size)) {
     NOTREACHED() << "couldn't map";
@@ -618,7 +613,7 @@ void WebContentsDelegateEfl::OnPrintedMetafileReceived(
     NOTREACHED() << "Invalid metafile header";
     return;
   }
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
+
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&WritePdfDataToFile, metafile.release(), params.filename));
@@ -669,7 +664,7 @@ void WebContentsDelegateEfl::RunFileChooser(
   web_view_->ShowFileChooser(render_frame_host, params);
 }
 
-content::ColorChooser* WebContentsDelegateEfl::OpenColorChooser(
+ColorChooser* WebContentsDelegateEfl::OpenColorChooser(
     WebContents* web_contents,
     SkColor color,
     const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions) {
@@ -697,13 +692,13 @@ bool WebContentsDelegateEfl::PreHandleGestureEvent(
     const blink::WebGestureEvent& event) {
   blink::WebInputEvent::Type event_type = event.GetType();
   switch (event_type) {
-    case blink::WebInputEvent::kGestureDoubleTap:
+    case blink::WebInputEvent::Type::kGestureDoubleTap:
       if (is_fullscreen_)
         return true;
       break;
-    case blink::WebInputEvent::kGesturePinchBegin:
-    case blink::WebInputEvent::kGesturePinchUpdate:
-    case blink::WebInputEvent::kGesturePinchEnd:
+    case blink::WebInputEvent::Type::kGesturePinchBegin:
+    case blink::WebInputEvent::Type::kGesturePinchUpdate:
+    case blink::WebInputEvent::Type::kGesturePinchEnd:
       if (!IsPinchToZoomEnabled() ||
           IsFullscreenForTabOrPending(&web_contents()))
         return true;
diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h
index 9dbd0e3..758bd6e 100644
--- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h
+++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h
@@ -33,37 +33,34 @@ class WebContentsDelegateEfl : public WebContentsDelegate,
                                public IPC::Sender {
  public:
   WebContentsDelegateEfl(EWebView*);
-  ~WebContentsDelegateEfl();
-
-  // Overridden from content::WebContentsDelegate:
-  content::WebContents* OpenURLFromTab(
-      content::WebContents* source,
-      const content::OpenURLParams& params) override;
-  void NavigationStateChanged(content::WebContents* source,
-                              content::InvalidateTypes changed_flags) override;
-  void LoadingStateChanged(content::WebContents* source,
+  ~WebContentsDelegateEfl() override;
+
+  // Overridden from WebContentsDelegate:
+  WebContents* OpenURLFromTab(WebContents* source,
+                              const OpenURLParams& params) override;
+  void NavigationStateChanged(WebContents* source,
+                              InvalidateTypes changed_flags) override;
+  void LoadingStateChanged(WebContents* source,
                            bool to_different_document) override;
   bool ShouldCreateWebContents(
-      content::WebContents* web_contents,
-      content::RenderFrameHost* opener,
-      content::SiteInstance* source_site_instance,
+      WebContents* web_contents,
+      RenderFrameHost* opener,
+      SiteInstance* source_site_instance,
       int32_t route_id,
       int32_t main_frame_route_id,
       int32_t main_frame_widget_route_id,
-      content::mojom::WindowContainerType window_container_type,
+      mojom::WindowContainerType window_container_type,
       const GURL& opener_url,
       const std::string& frame_name,
       const GURL& target_url,
       const std::string& partition_id,
-      content::SessionStorageNamespace* session_storage_namespace) override;
-  void CloseContents(content::WebContents* source) override;
+      SessionStorageNamespace* session_storage_namespace);
+  void CloseContents(WebContents* source) override;
   void EnterFullscreenModeForTab(
-      content::WebContents* web_contents,
-      const GURL& origin,
-      const blink::WebFullscreenOptions& options) override;
-  void ExitFullscreenModeForTab(content::WebContents* web_contents) override;
-  bool IsFullscreenForTabOrPending(
-      const content::WebContents* web_contents) const override;
+      RenderFrameHost* requesting_frame,
+      const blink::mojom::FullscreenOptions& options) override;
+  void ExitFullscreenModeForTab(WebContents* web_contents) override;
+  bool IsFullscreenForTabOrPending(const WebContents* web_contents) override;
 
 #if defined(TIZEN_MULTIMEDIA_SUPPORT)
   virtual bool CheckMediaAccessPermission(WebContents* web_contents,
@@ -81,15 +78,15 @@ class WebContentsDelegateEfl : public WebContentsDelegate,
   void RequestMediaAccessDeny(const MediaStreamRequest& request,
                               MediaResponseCallback callback);
 #endif
-  void RegisterProtocolHandler(content::WebContents* web_contents,
+  void RegisterProtocolHandler(WebContents* web_contents,
                                const std::string& protocol,
                                const GURL& url,
                                bool user_gesture) override;
-  void UnregisterProtocolHandler(content::WebContents* web_contents,
+  void UnregisterProtocolHandler(WebContents* web_contents,
                                  const std::string& protocol,
                                  const GURL& url,
                                  bool user_gesture) override;
-  void FindReply(content::WebContents* web_contents,
+  void FindReply(WebContents* web_contents,
                  int request_id,
                  int number_of_matches,
                  const gfx::Rect& selection_rect,
@@ -103,7 +100,6 @@ class WebContentsDelegateEfl : public WebContentsDelegate,
       int cert_error,
       const net::SSLInfo& ssl_info,
       const GURL& url,
-      ResourceType resource_type,
       bool overridable,
       bool strict_enforcement,
       base::Callback<void(CertificateRequestResultType)>& callback);
@@ -129,7 +125,7 @@ class WebContentsDelegateEfl : public WebContentsDelegate,
                               const base::string16& message,
                               int32_t line_no,
                               const base::string16& source_id) override;
-  void RunFileChooser(content::RenderFrameHost* render_frame_host,
+  void RunFileChooser(RenderFrameHost* render_frame_host,
                       std::unique_ptr<FileSelectListener> listener,
                       const blink::mojom::FileChooserParams& params) override;
   ColorChooser* OpenColorChooser(
@@ -151,14 +147,13 @@ class WebContentsDelegateEfl : public WebContentsDelegate,
   // WebContentsObserver---------------------------------------------------
   void DidFailLoad(RenderFrameHost* render_frame_host,
                    const GURL& validated_url,
-                   int error_code,
-                   const base::string16& error_description) override;
+                   int error_code) override;
 
   // IPC::Sender-----------------------------------------------------------
   bool Send(IPC::Message* message) override;
 
   // EWK_BRINGUP: These APIs are removed in upstream.
-  void TitleWasSet(content::NavigationEntry* entry, bool explicit_set);
+  void TitleWasSet(NavigationEntry* entry, bool explicit_set);
 
   void LoadProgressChanged(WebContents* source, double progress);
   void DidFinishLoad(RenderFrameHost* render_frame_host,
@@ -169,7 +164,9 @@ class WebContentsDelegateEfl : public WebContentsDelegate,
                                        bool is_error_page,
                                        bool is_iframe_srcdoc);
 
-  void DidUpdateFaviconURL(const std::vector<FaviconURL>& candidates);
+  void DidUpdateFaviconURL(
+      RenderFrameHost* render_frame_host,
+      const std::vector<blink::mojom::FaviconURLPtr>& candidates) override;
 
   void DidCommitProvisionalLoadForFrame(RenderFrameHost* render_frame_host,
                                         const GURL& url,
diff --git a/tizen_src/ewk/efl_integration/wrt/v8widget.cc b/tizen_src/ewk/efl_integration/wrt/v8widget.cc
index dd4a03f..f6a8044 100644
--- a/tizen_src/ewk/efl_integration/wrt/v8widget.cc
+++ b/tizen_src/ewk/efl_integration/wrt/v8widget.cc
@@ -4,7 +4,7 @@
 
 #include "wrt/v8widget.h"
 
-#include "base/logging.h"
+#include "base/notreached.h"
 #include "wrt/dynamicplugin.h"
 #include "wrt/wrt_dynamicplugin.h"
 
diff --git a/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc
index d57a495..af04f35 100644
--- a/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc
+++ b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc
@@ -8,7 +8,6 @@
 #include "common/render_messages_ewk.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/render_process_host.h"
-#include "content/public/browser/resource_request_info.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc_message_start_ewk.h"
 #include "net/url_request/url_request.h"
@@ -94,11 +93,13 @@ void WrtWidgetHost::GetUrlForRequest(
   int callback_id = callback_id_generator_.GetNext();
   callbacks_[callback_id] = callback;
 
+#if !defined(EWK_BRINGUP)  // FIXME: m85 bringup
   int renderer_id, frame_id;
   if (content::ResourceRequestInfo::GetRenderFrameForRequest(request, &renderer_id,
                                                              &frame_id))
     if (SendToRenderer(renderer_id, new WrtMsg_ParseUrl(callback_id, request->url())))
       return;
+#endif
 
   callbacks_.erase(callback_id);
   callback.Run(GURL());
-- 
2.7.4