[M120][XWalkExtension] Remove EWK_BRINGUP in XWalkExtension

Remove EWK_BRINGUP in XWalkExtension

Change-Id: I9e8dfc0f18e0c5ff511ca7fb7534eae59258fa28
Signed-off-by: zhaosy <shiyusy.zhao@samsung.com>

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 341d893..f1b887e 100644 (file)
--- a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
@@ -45,10 +45,9 @@
 
 #if BUILDFLAG(IS_TIZEN)
 #include <vconf.h>
-#if BUILDFLAG(IS_TIZEN_TV) && !defined(EWK_BRINGUP)
+
 #include "components/xwalk_extensions/browser/xwalk_extension_manager.h"
 #endif
-#endif
 
 #include "private/ewk_notification_private.h"
 
@@ -647,7 +646,7 @@ void ContentBrowserClientEfl::ExposeInterfacesToRenderer(
           switches::kXWalkExtensionPath)) {
     return;
   }
-#if BUILDFLAG(IS_TIZEN) && !defined(EWK_BRINGUP)
+#if BUILDFLAG(IS_TIZEN)
   registry->AddInterface(
       base::BindRepeating(&wrt::XWalkExtensionManager::Bind),
       content::GetUIThreadTaskRunner({}));

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 01057cb..e97324b 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
@@ -9,10 +9,9 @@
 
 #if BUILDFLAG(IS_TIZEN)
 #include <vconf/vconf.h>
-#if BUILDFLAG(IS_TIZEN_TV) && !defined(EWK_BRINGUP)
+
 #include "components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
 #endif
-#endif
 
 #include "base/command_line.h"
 #include "base/path_service.h"
@@ -169,9 +168,9 @@ void ContentRendererClientEfl::RenderThreadStarted() {
   if (!command_line.HasSwitch(switches::kSingleProcess))
     LocaleEfl::Initialize();
 
-#if BUILDFLAG(IS_TIZEN) && !defined(EWK_BRINGUP)
+#if BUILDFLAG(IS_TIZEN)
   if (command_line.HasSwitch(switches::kXWalkExtensionPath)) {
-    wrt::XWalkExtensionRendererController::GetInstance().SetPrivilegeChecker(
+    wrt::XWalkExtensionRendererController::SetPrivilegeChecker(
         base::BindRepeating([]() -> bool {
           // TODO(dh81.song)
           // necessary to decide whether allow webapis for external URLs
@@ -267,7 +266,7 @@ void ContentRendererClientEfl::DidCreateScriptContext(
     content::RenderFrame* render_frame,
     v8::Handle<v8::Context> context,
     int world_id) {
-#if BUILDFLAG(IS_TIZEN) && !defined(EWK_BRINGUP)
+#if BUILDFLAG(IS_TIZEN)
   if (ShouldRegisterXWalkExtension(world_id))
     wrt::XWalkExtensionRendererController::DidCreateScriptContext(context);
 #endif
@@ -299,7 +298,7 @@ void ContentRendererClientEfl::WillReleaseScriptContext(
     blink::WebFrame* frame,
     v8::Handle<v8::Context> context,
     int world_id) {
-#if BUILDFLAG(IS_TIZEN) && !defined(EWK_BRINGUP)
+#if BUILDFLAG(IS_TIZEN)
   if (ShouldRegisterXWalkExtension(world_id))
     wrt::XWalkExtensionRendererController::WillReleaseScriptContext(context);
 #endif