Add an API for getting web view when request is intercepted.
[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-WebView.cpp
index 6da9ee0..107582c 100755 (executable)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 #include <dali-toolkit-test-suite-utils.h>
 #include "dali-toolkit-test-utils/toolkit-timer.h"
 
+#include <dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-settings.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-view.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
 #include <dali.h>
-#include <dali/devel-api/adaptor-framework/web-engine-certificate.h>
-#include <dali/devel-api/adaptor-framework/web-engine-console-message.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context-menu.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context-menu-item.h>
-#include <dali/devel-api/adaptor-framework/web-engine-form-repost-decision.h>
-#include <dali/devel-api/adaptor-framework/web-engine-frame.h>
-#include <dali/devel-api/adaptor-framework/web-engine-hit-test.h>
-#include <dali/devel-api/adaptor-framework/web-engine-http-auth-handler.h>
-#include <dali/devel-api/adaptor-framework/web-engine-load-error.h>
-#include <dali/devel-api/adaptor-framework/web-engine-policy-decision.h>
-#include <dali/devel-api/adaptor-framework/web-engine-request-interceptor.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context.h>
-#include <dali/devel-api/adaptor-framework/web-engine-security-origin.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-certificate.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu-item.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-cookie-manager.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-form-repost-decision.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-frame.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-hit-test.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-http-auth-handler.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-load-error.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-policy-decision.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-request-interceptor.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-security-origin.h>
 #include <dali/integration-api/events/hover-event-integ.h>
 #include <dali/integration-api/events/key-event-integ.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/wheel-event-integ.h>
 #include <dali/public-api/images/pixel-data.h>
-#include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-context.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-cookie-manager.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-settings.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-view.h>
 
 using namespace Dali;
 using namespace Toolkit;
 
 namespace
 {
-
-const char* const TEST_URL1( "http://www.somewhere.valid1.com" );
-const char* const TEST_URL2( "http://www.somewhere.valid2.com" );
-
-static int gPageLoadStartedCallbackCalled = 0;
-static int gPageLoadInProgressCallbackCalled = 0;
-static int gPageLoadFinishedCallbackCalled = 0;
-static int gPageLoadErrorCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineLoadError> gPageLoadErrorInstance = nullptr;
-static int gScrollEdgeReachedCallbackCalled = 0;
-static int gUrlChangedCallbackCalled = 0;
-static int gEvaluateJavaScriptCallbackCalled = 0;
-static int gJavaScriptAlertCallbackCalled = 0;
-static int gJavaScriptConfirmCallbackCalled = 0;
-static int gJavaScriptPromptCallbackCalled = 0;
-static int gScreenshotCapturedCallbackCalled = 0;
-static int gVideoPlayingCallbackCalled = 0;
-static int gGeolocationPermissionCallbackCalled = 0;
-static bool gTouched = false;
-static bool gHovered = false;
-static bool gWheelEventHandled = false;
-static int gFormRepostDecidedCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineFormRepostDecision> gFormRepostDecidedInstance = nullptr;
-static int gFrameRenderedCallbackCalled = 0;
-static int gConsoleMessageCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineConsoleMessage> gConsoleMessageInstance = nullptr;
-static int gResponsePolicyDecidedCallbackCalled = 0;
-static int gNavigationPolicyDecidedCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEnginePolicyDecision> gResponsePolicyDecisionInstance = nullptr;
-static int gCertificateConfirmCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineCertificate> gCertificateConfirmInstance = nullptr;
-static int gSslCertificateChangedCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineCertificate> gSslCertificateInstance = nullptr;
-static int gHttpAuthHandlerCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineHttpAuthHandler> gHttpAuthInstance = nullptr;
-static int gSecurityOriginsAcquiredCallbackCalled = 0;
-static int gStorageUsageAcquiredCallbackCalled = 0;
-static int gFormPasswordsAcquiredCallbackCalled = 0;
-static int gDownloadStartedCallbackCalled = 0;
-static int gMimeOverriddenCallbackCalled = 0;
-static int gRequestInterceptedCallbackCalled = 0;
-static Dali::WebEngineRequestInterceptorPtr gRequestInterceptorInstance = nullptr;
-static std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>> gSecurityOriginList;
+const char* const TEST_URL1("http://www.somewhere.valid1.com");
+const char* const TEST_URL2("http://www.somewhere.valid2.com");
+
+static int                                                                gPageLoadStartedCallbackCalled         = 0;
+static int                                                                gPageLoadInProgressCallbackCalled      = 0;
+static int                                                                gPageLoadFinishedCallbackCalled        = 0;
+static int                                                                gPageLoadErrorCallbackCalled           = 0;
+static std::unique_ptr<Dali::WebEngineLoadError>                          gPageLoadErrorInstance                 = nullptr;
+static int                                                                gScrollEdgeReachedCallbackCalled       = 0;
+static int                                                                gUrlChangedCallbackCalled              = 0;
+static int                                                                gEvaluateJavaScriptCallbackCalled      = 0;
+static int                                                                gJavaScriptAlertCallbackCalled         = 0;
+static int                                                                gJavaScriptConfirmCallbackCalled       = 0;
+static int                                                                gJavaScriptPromptCallbackCalled        = 0;
+static int                                                                gScreenshotCapturedCallbackCalled      = 0;
+static int                                                                gVideoPlayingCallbackCalled            = 0;
+static int                                                                gGeolocationPermissionCallbackCalled   = 0;
+static bool                                                               gTouched                               = false;
+static bool                                                               gHovered                               = false;
+static bool                                                               gWheelEventHandled                     = false;
+static int                                                                gFormRepostDecidedCallbackCalled       = 0;
+static std::unique_ptr<Dali::WebEngineFormRepostDecision>                 gFormRepostDecidedInstance             = nullptr;
+static int                                                                gFrameRenderedCallbackCalled           = 0;
+static int                                                                gConsoleMessageCallbackCalled          = 0;
+static std::unique_ptr<Dali::WebEngineConsoleMessage>                     gConsoleMessageInstance                = nullptr;
+static int                                                                gResponsePolicyDecidedCallbackCalled   = 0;
+static int                                                                gNavigationPolicyDecidedCallbackCalled = 0;
+static std::unique_ptr<Dali::WebEnginePolicyDecision>                     gResponsePolicyDecisionInstance        = nullptr;
+static int                                                                gCertificateConfirmCallbackCalled      = 0;
+static std::unique_ptr<Dali::WebEngineCertificate>                        gCertificateConfirmInstance            = nullptr;
+static int                                                                gSslCertificateChangedCallbackCalled   = 0;
+static std::unique_ptr<Dali::WebEngineCertificate>                        gSslCertificateInstance                = nullptr;
+static int                                                                gHttpAuthHandlerCallbackCalled         = 0;
+static std::unique_ptr<Dali::WebEngineHttpAuthHandler>                    gHttpAuthInstance                      = nullptr;
+static int                                                                gSecurityOriginsAcquiredCallbackCalled = 0;
+static int                                                                gStorageUsageAcquiredCallbackCalled    = 0;
+static int                                                                gFormPasswordsAcquiredCallbackCalled   = 0;
+static int                                                                gDownloadStartedCallbackCalled         = 0;
+static int                                                                gMimeOverriddenCallbackCalled          = 0;
+static int                                                                gRequestInterceptedCallbackCalled      = 0;
+static Dali::WebEngineRequestInterceptorPtr                               gRequestInterceptorInstance            = nullptr;
+static std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>        gSecurityOriginList;
 static std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>> gPasswordDataList;
-static int gContextMenuShownCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineContextMenu> gContextMenuShownInstance = nullptr;
-static int gContextMenuHiddenCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineContextMenu> gContextMenuHiddenInstance = nullptr;
-static int gHitTestCreatedCallbackCalled = 0;
-static int gCookieManagerChangsWatchCallbackCalled = 0;
-static int gPlainTextReceivedCallbackCalled = 0;
+static int                                                                gContextMenuShownCallbackCalled         = 0;
+static std::unique_ptr<Dali::WebEngineContextMenu>                        gContextMenuShownInstance               = nullptr;
+static int                                                                gContextMenuHiddenCallbackCalled        = 0;
+static std::unique_ptr<Dali::WebEngineContextMenu>                        gContextMenuHiddenInstance              = nullptr;
+static int                                                                gHitTestCreatedCallbackCalled           = 0;
+static int                                                                gCookieManagerChangsWatchCallbackCalled = 0;
+static int                                                                gPlainTextReceivedCallbackCalled        = 0;
 
 struct CallbackFunctor
 {
   CallbackFunctor(bool* callbackFlag)
-  : mCallbackFlag( callbackFlag )
+  : mCallbackFlag(callbackFlag)
   {
   }
 
@@ -212,7 +210,7 @@ static bool OnGeolocationPermission(const std::string&, const std::string&)
   return true;
 }
 
-static bool OnTouched( Actor actor, const Dali::TouchEvent& touch )
+static bool OnTouched(Actor actor, const Dali::TouchEvent& touch)
 {
   gTouched = true;
   return true;
@@ -336,41 +334,41 @@ int UtcDaliWebViewBasics(void)
   ToolkitTestApplication application;
 
   // Copy and Assignment Test
-  tet_infoline( "UtcDaliWebViewBasic Copy and Assignment Test" );
+  tet_infoline("UtcDaliWebViewBasic Copy and Assignment Test");
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  WebView copy( view );
-  DALI_TEST_CHECK( view == copy );
+  WebView copy(view);
+  DALI_TEST_CHECK(view == copy);
 
   WebView assign;
-  DALI_TEST_CHECK( !assign );
+  DALI_TEST_CHECK(!assign);
 
   assign = copy;
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign == view);
 
   // DownCast Test
-  tet_infoline( "UtcDaliWebViewBasic DownCast Test" );
+  tet_infoline("UtcDaliWebViewBasic DownCast Test");
   BaseHandle handle(view);
 
-  WebView view2 = WebView::DownCast( handle );
-  DALI_TEST_CHECK( view );
-  DALI_TEST_CHECK( view2 );
-  DALI_TEST_CHECK( view == view2 );
+  WebView view2 = WebView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(view2);
+  DALI_TEST_CHECK(view == view2);
 
   // TypeRegistry Test
-  tet_infoline( "UtcDaliWebViewBasic TypeRegistry Test" );
+  tet_infoline("UtcDaliWebViewBasic TypeRegistry Test");
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "WebView" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("WebView");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle2 = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle2 );
+  DALI_TEST_CHECK(handle2);
 
-  WebView view3 = WebView::DownCast( handle2 );
-  DALI_TEST_CHECK( view3 );
+  WebView view3 = WebView::DownCast(handle2);
+  DALI_TEST_CHECK(view3);
 
   END_TEST;
 }
@@ -380,63 +378,63 @@ int UtcDaliWebViewPageNavigation(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
-  application.GetScene().Add( view );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( view );
-
-  view.RegisterPageLoadStartedCallback( &OnPageLoadStarted );
-  view.RegisterPageLoadInProgressCallback( &OnPageLoadInProgress );
-  view.RegisterPageLoadFinishedCallback( &OnPageLoadFinished );
-  view.RegisterUrlChangedCallback( &OnUrlChanged );
-  DALI_TEST_EQUALS( gPageLoadStartedCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadInProgressCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadFinishedCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gUrlChangedCallbackCalled, 0, TEST_LOCATION );
-
-  view.LoadUrl( TEST_URL1 );
+  DALI_TEST_CHECK(view);
+
+  view.RegisterPageLoadStartedCallback(&OnPageLoadStarted);
+  view.RegisterPageLoadInProgressCallback(&OnPageLoadInProgress);
+  view.RegisterPageLoadFinishedCallback(&OnPageLoadFinished);
+  view.RegisterUrlChangedCallback(&OnUrlChanged);
+  DALI_TEST_EQUALS(gPageLoadStartedCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadInProgressCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadFinishedCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gUrlChangedCallbackCalled, 0, TEST_LOCATION);
+
+  view.LoadUrl(TEST_URL1);
   view.GetNaturalSize();
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( view.CanGoBack(), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadStartedCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadInProgressCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadFinishedCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gUrlChangedCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.CanGoBack(), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadStartedCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadInProgressCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadFinishedCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gUrlChangedCallbackCalled, 1, TEST_LOCATION);
 
-  view.LoadUrl( TEST_URL2 );
+  view.LoadUrl(TEST_URL2);
   view.Suspend();
-  view.SetProperty( Actor::Property::SIZE, Vector2( 400, 300 ) );
+  view.SetProperty(Actor::Property::SIZE, Vector2(400, 300));
   application.SendNotification();
   application.Render();
   Test::EmitGlobalTimerSignal();
   view.Resume();
-  DALI_TEST_EQUALS( view.CanGoBack(), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( view.CanGoForward(), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadStartedCallbackCalled, 2, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadInProgressCallbackCalled, 2, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadFinishedCallbackCalled, 2, TEST_LOCATION );
-  DALI_TEST_EQUALS( gUrlChangedCallbackCalled, 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.CanGoBack(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.CanGoForward(), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadStartedCallbackCalled, 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadInProgressCallbackCalled, 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadFinishedCallbackCalled, 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(gUrlChangedCallbackCalled, 2, TEST_LOCATION);
 
   view.GoBack();
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_CHECK( !view.CanGoBack() );
-  DALI_TEST_CHECK( view.CanGoForward() );
+  DALI_TEST_CHECK(!view.CanGoBack());
+  DALI_TEST_CHECK(view.CanGoForward());
 
   view.GoForward();
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_CHECK( view.CanGoBack() );
-  DALI_TEST_CHECK( !view.CanGoForward() );
+  DALI_TEST_CHECK(view.CanGoBack());
+  DALI_TEST_CHECK(!view.CanGoForward());
 
   view.Reload();
   view.StopLoading();
   view.ClearHistory();
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_CHECK( !view.CanGoBack() );
-  DALI_TEST_CHECK( !view.CanGoForward() );
+  DALI_TEST_CHECK(!view.CanGoBack());
+  DALI_TEST_CHECK(!view.CanGoForward());
 
   END_TEST;
 }
@@ -446,24 +444,24 @@ int UtcDaliWebViewPageLoadErrorConsoleMessage(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
-  application.GetScene().Add( view );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.RegisterPageLoadErrorCallback( &OnPageLoadError );
-  view.RegisterConsoleMessageReceivedCallback( &OnConsoleMessage );
-  DALI_TEST_EQUALS( gPageLoadErrorCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gConsoleMessageCallbackCalled, 0, TEST_LOCATION );
+  view.RegisterPageLoadErrorCallback(&OnPageLoadError);
+  view.RegisterConsoleMessageReceivedCallback(&OnConsoleMessage);
+  DALI_TEST_EQUALS(gPageLoadErrorCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gConsoleMessageCallbackCalled, 0, TEST_LOCATION);
 
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gPageLoadErrorCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gConsoleMessageCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gPageLoadErrorCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gConsoleMessageCallbackCalled, 1, TEST_LOCATION);
 
   // error code.
   DALI_TEST_CHECK(gPageLoadErrorInstance);
@@ -483,7 +481,7 @@ int UtcDaliWebViewPageLoadErrorConsoleMessage(void)
   DALI_TEST_EQUALS(gConsoleMessageInstance->GetText(), testConsoleText, TEST_LOCATION);
 
   // reset
-  gPageLoadErrorInstance = nullptr;
+  gPageLoadErrorInstance  = nullptr;
   gConsoleMessageInstance = nullptr;
 
   END_TEST;
@@ -494,41 +492,41 @@ int UtcDaliWebViewTouchAndKeys(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
   view.GetNaturalSize();
-  view.TouchedSignal().Connect( &OnTouched );
+  view.TouchedSignal().Connect(&OnTouched);
 
   // Touch event
   Dali::Integration::TouchEvent event;
-  Dali::Integration::Point pointDown, pointUp;
+  Dali::Integration::Point      pointDown, pointUp;
 
   event = Dali::Integration::TouchEvent();
-  pointDown.SetState( PointState::DOWN );
-  pointDown.SetScreenPosition( Vector2( 10, 10 ) );
-  event.AddPoint( pointDown );
-  application.ProcessEvent( event );
+  pointDown.SetState(PointState::DOWN);
+  pointDown.SetScreenPosition(Vector2(10, 10));
+  event.AddPoint(pointDown);
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  pointUp.SetState( PointState::UP );
-  pointUp.SetScreenPosition( Vector2( 10, 10 ) );
-  event.AddPoint( pointUp );
-  application.ProcessEvent( event );
+  pointUp.SetState(PointState::UP);
+  pointUp.SetScreenPosition(Vector2(10, 10));
+  event.AddPoint(pointUp);
+  application.ProcessEvent(event);
 
   // Key event
-  Toolkit::KeyboardFocusManager::Get().SetCurrentFocusActor( view );
-  application.ProcessEvent( Integration::KeyEvent( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE ) );
+  Toolkit::KeyboardFocusManager::Get().SetCurrentFocusActor(view);
+  application.ProcessEvent(Integration::KeyEvent("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
 
-  DALI_TEST_CHECK( gTouched );
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(gTouched);
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
@@ -538,23 +536,23 @@ int UtcDaliWebViewFocusGainedAndLost(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
   view.SetKeyInputFocus();
-  DALI_TEST_CHECK( view.HasKeyInputFocus() );
+  DALI_TEST_CHECK(view.HasKeyInputFocus());
 
   // reset
   view.ClearKeyInputFocus();
-  DALI_TEST_CHECK( !view.HasKeyInputFocus() );
+  DALI_TEST_CHECK(!view.HasKeyInputFocus());
 
   END_TEST;
 }
@@ -564,24 +562,24 @@ int UtcDaliWebViewPropertyPageZoomFactor(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
-  view.SetProperty( WebView::Property::PAGE_ZOOM_FACTOR, 1.5f);
-  float zoomFactor = view.GetProperty<float>( WebView::Property::PAGE_ZOOM_FACTOR );
-  DALI_TEST_EQUALS( zoomFactor, 1.5f, TEST_LOCATION );
+  view.SetProperty(WebView::Property::PAGE_ZOOM_FACTOR, 1.5f);
+  float zoomFactor = view.GetProperty<float>(WebView::Property::PAGE_ZOOM_FACTOR);
+  DALI_TEST_EQUALS(zoomFactor, 1.5f, TEST_LOCATION);
 
-  view.SetProperty( WebView::Property::PAGE_ZOOM_FACTOR, 1.0f);
-  zoomFactor = view.GetProperty<float>( WebView::Property::PAGE_ZOOM_FACTOR );
-  DALI_TEST_EQUALS( zoomFactor, 1.0f, TEST_LOCATION );
+  view.SetProperty(WebView::Property::PAGE_ZOOM_FACTOR, 1.0f);
+  zoomFactor = view.GetProperty<float>(WebView::Property::PAGE_ZOOM_FACTOR);
+  DALI_TEST_EQUALS(zoomFactor, 1.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -591,24 +589,24 @@ int UtcDaliWebViewPropertyTextZoomFactor(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
-  view.SetProperty( WebView::Property::TEXT_ZOOM_FACTOR, 1.5f);
-  float zoomFactor = view.GetProperty<float>( WebView::Property::TEXT_ZOOM_FACTOR );
-  DALI_TEST_EQUALS( zoomFactor, 1.5f, TEST_LOCATION );
+  view.SetProperty(WebView::Property::TEXT_ZOOM_FACTOR, 1.5f);
+  float zoomFactor = view.GetProperty<float>(WebView::Property::TEXT_ZOOM_FACTOR);
+  DALI_TEST_EQUALS(zoomFactor, 1.5f, TEST_LOCATION);
 
-  view.SetProperty( WebView::Property::TEXT_ZOOM_FACTOR, 1.0f);
-  zoomFactor = view.GetProperty<float>( WebView::Property::TEXT_ZOOM_FACTOR );
-  DALI_TEST_EQUALS( zoomFactor, 1.0f, TEST_LOCATION );
+  view.SetProperty(WebView::Property::TEXT_ZOOM_FACTOR, 1.0f);
+  zoomFactor = view.GetProperty<float>(WebView::Property::TEXT_ZOOM_FACTOR);
+  DALI_TEST_EQUALS(zoomFactor, 1.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -618,19 +616,19 @@ int UtcDaliWebViewPropertyLoadProgressPercentage(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
-  float percentage = view.GetProperty<float>( WebView::Property::LOAD_PROGRESS_PERCENTAGE );
-  DALI_TEST_EQUALS( percentage, 0.5f, TEST_LOCATION );
+  float percentage = view.GetProperty<float>(WebView::Property::LOAD_PROGRESS_PERCENTAGE);
+  DALI_TEST_EQUALS(percentage, 0.5f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -640,20 +638,20 @@ int UtcDaliWebViewMove(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
-  view.SetProperty( Actor::Property::POSITION, Vector2( 100, 100 ));
-  Vector3 viewPos = view.GetProperty<Vector3>( Actor::Property::POSITION );
-  DALI_TEST_EQUALS( viewPos, Vector3( 100, 100, 0 ), TEST_LOCATION );
+  view.SetProperty(Actor::Property::POSITION, Vector2(100, 100));
+  Vector3 viewPos = view.GetProperty<Vector3>(Actor::Property::POSITION);
+  DALI_TEST_EQUALS(viewPos, Vector3(100, 100, 0), TEST_LOCATION);
 
   END_TEST;
 }
@@ -663,22 +661,22 @@ int UtcDaliWebViewPropertyVideoHoleEnabled(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   const bool kDefaultValue = false;
-  const bool kTestValue = true;
+  const bool kTestValue    = true;
 
   // Check default value
-  bool output;
-  Property::Value value = view.GetProperty( WebView::Property::VIDEO_HOLE_ENABLED );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kDefaultValue, TEST_LOCATION );
+  bool            output;
+  Property::Value value = view.GetProperty(WebView::Property::VIDEO_HOLE_ENABLED);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kDefaultValue, TEST_LOCATION);
 
   // Check Set/GetProperty
-  view.SetProperty( WebView::Property::VIDEO_HOLE_ENABLED, kTestValue );
-  value = view.GetProperty( WebView::Property::VIDEO_HOLE_ENABLED );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kTestValue, TEST_LOCATION );
+  view.SetProperty(WebView::Property::VIDEO_HOLE_ENABLED, kTestValue);
+  value = view.GetProperty(WebView::Property::VIDEO_HOLE_ENABLED);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kTestValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -688,22 +686,22 @@ int UtcDaliWebViewPropertyMouseEventsEnabled(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   const bool kDefaultValue = true;
-  const bool kTestValue = false;
+  const bool kTestValue    = false;
 
   // Check default value
-  bool output;
-  Property::Value value = view.GetProperty( WebView::Property::MOUSE_EVENTS_ENABLED );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kDefaultValue, TEST_LOCATION );
+  bool            output;
+  Property::Value value = view.GetProperty(WebView::Property::MOUSE_EVENTS_ENABLED);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kDefaultValue, TEST_LOCATION);
 
   // Check Set/GetProperty
-  view.SetProperty( WebView::Property::MOUSE_EVENTS_ENABLED, kTestValue );
-  value = view.GetProperty( WebView::Property::MOUSE_EVENTS_ENABLED );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kTestValue, TEST_LOCATION );
+  view.SetProperty(WebView::Property::MOUSE_EVENTS_ENABLED, kTestValue);
+  value = view.GetProperty(WebView::Property::MOUSE_EVENTS_ENABLED);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kTestValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -713,22 +711,22 @@ int UtcDaliWebViewPropertyKeyEventsEnabled(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   const bool kDefaultValue = true;
-  const bool kTestValue = false;
+  const bool kTestValue    = false;
 
   // Check default value
-  bool output;
-  Property::Value value = view.GetProperty( WebView::Property::KEY_EVENTS_ENABLED );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kDefaultValue, TEST_LOCATION );
+  bool            output;
+  Property::Value value = view.GetProperty(WebView::Property::KEY_EVENTS_ENABLED);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kDefaultValue, TEST_LOCATION);
 
   // Check Set/GetProperty
-  view.SetProperty( WebView::Property::KEY_EVENTS_ENABLED, kTestValue );
-  value = view.GetProperty( WebView::Property::KEY_EVENTS_ENABLED );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kTestValue, TEST_LOCATION );
+  view.SetProperty(WebView::Property::KEY_EVENTS_ENABLED, kTestValue);
+  value = view.GetProperty(WebView::Property::KEY_EVENTS_ENABLED);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kTestValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -738,53 +736,53 @@ int UtcDaliWebViewHoverAndWheel(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  DALI_TEST_CHECK(view);
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
   view.GetNaturalSize();
-  view.HoveredSignal().Connect( &OnHovered );
-  view.WheelEventSignal().Connect( &OnWheelEvent );
+  view.HoveredSignal().Connect(&OnHovered);
+  view.WheelEventSignal().Connect(&OnWheelEvent);
 
   // Hover event
   Dali::Integration::HoverEvent event = Dali::Integration::HoverEvent();
-  Dali::Integration::Point pointDown;
-  pointDown.SetState( PointState::DOWN );
-  pointDown.SetScreenPosition( Vector2( 10, 10 ) );
-  event.AddPoint( pointDown );
-  application.ProcessEvent( event );
+  Dali::Integration::Point      pointDown;
+  pointDown.SetState(PointState::DOWN);
+  pointDown.SetScreenPosition(Vector2(10, 10));
+  event.AddPoint(pointDown);
+  application.ProcessEvent(event);
 
   event = Dali::Integration::HoverEvent();
   Dali::Integration::Point pointUp;
-  pointUp.SetState( PointState::UP );
-  pointUp.SetScreenPosition( Vector2( 10, 10 ) );
-  event.AddPoint( pointUp );
-  application.ProcessEvent( event );
+  pointUp.SetState(PointState::UP);
+  pointUp.SetScreenPosition(Vector2(10, 10));
+  event.AddPoint(pointUp);
+  application.ProcessEvent(event);
 
   event = Dali::Integration::HoverEvent();
   Dali::Integration::Point pointMotion;
-  pointUp.SetState( PointState::MOTION );
-  pointUp.SetScreenPosition( Vector2( 10, 10 ) );
-  event.AddPoint( pointMotion );
-  application.ProcessEvent( event );
+  pointUp.SetState(PointState::MOTION);
+  pointUp.SetScreenPosition(Vector2(10, 10));
+  event.AddPoint(pointMotion);
+  application.ProcessEvent(event);
 
   // Wheel event
   Dali::Integration::WheelEvent wheelEvent;
-  wheelEvent.type = Dali::Integration::WheelEvent::Type::MOUSE_WHEEL;
+  wheelEvent.type      = Dali::Integration::WheelEvent::Type::MOUSE_WHEEL;
   wheelEvent.direction = 0;
-  wheelEvent.point = Vector2( 20, 20 );
-  wheelEvent.delta = 10;
-  application.ProcessEvent( wheelEvent );
+  wheelEvent.point     = Vector2(20, 20);
+  wheelEvent.delta     = 10;
+  application.ProcessEvent(wheelEvent);
   application.SendNotification();
 
-  DALI_TEST_CHECK( gHovered );
-  DALI_TEST_CHECK( gWheelEventHandled );
+  DALI_TEST_CHECK(gHovered);
+  DALI_TEST_CHECK(gWheelEventHandled);
 
   END_TEST;
 }
@@ -794,24 +792,24 @@ int UtcDaliWebViewFormRepostDecidedFrameRendering(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
-  application.GetScene().Add( view );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   view.RegisterFormRepostDecidedCallback(&OnFormRepostDecided);
   view.RegisterFrameRenderedCallback(&OnFrameRendered);
-  DALI_TEST_EQUALS( gFormRepostDecidedCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gFrameRenderedCallbackCalled, 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gFormRepostDecidedCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gFrameRenderedCallbackCalled, 0, TEST_LOCATION);
 
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gFormRepostDecidedCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gFrameRenderedCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gFormRepostDecidedCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gFrameRenderedCallbackCalled, 1, TEST_LOCATION);
 
   // form repost decision.
   DALI_TEST_CHECK(gFormRepostDecidedInstance);
@@ -828,27 +826,27 @@ int UtcDaliWebViewSslCertificateHttpAuthentication(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
-  application.GetScene().Add( view );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   view.RegisterCertificateConfirmedCallback(&OnCertificateConfirm);
   view.RegisterSslCertificateChangedCallback(&OnSslCertificateChanged);
   view.RegisterHttpAuthHandlerCallback(&OnHttpAuthHandler);
-  DALI_TEST_EQUALS( gCertificateConfirmCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gSslCertificateChangedCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gHttpAuthHandlerCallbackCalled, 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gCertificateConfirmCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gSslCertificateChangedCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gHttpAuthHandlerCallbackCalled, 0, TEST_LOCATION);
 
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gCertificateConfirmCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gSslCertificateChangedCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gHttpAuthHandlerCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gCertificateConfirmCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gSslCertificateChangedCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gHttpAuthHandlerCallbackCalled, 1, TEST_LOCATION);
 
   // certificate.
   DALI_TEST_CHECK(gCertificateConfirmInstance);
@@ -868,8 +866,8 @@ int UtcDaliWebViewSslCertificateHttpAuthentication(void)
 
   // reset
   gCertificateConfirmInstance = nullptr;
-  gSslCertificateInstance = nullptr;
-  gHttpAuthInstance = nullptr;
+  gSslCertificateInstance     = nullptr;
+  gHttpAuthInstance           = nullptr;
 
   END_TEST;
 }
@@ -879,10 +877,10 @@ int UtcDaliWebViewGetWebBackForwardList(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebBackForwardList* bfList = view.GetBackForwardList();
-  DALI_TEST_CHECK( bfList != 0 );
+  DALI_TEST_CHECK(bfList != 0);
 
   END_TEST;
 }
@@ -891,11 +889,8 @@ int UtcDaliWebViewGetWebContext(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-
-  Dali::Toolkit::WebContext* context = view.GetContext();
-  DALI_TEST_CHECK( context != 0 );
+  Dali::WebEngineContext* context = WebView::GetContext();
+  DALI_TEST_CHECK(context != nullptr);
 
   END_TEST;
 }
@@ -904,11 +899,8 @@ int UtcDaliWebViewGetWebCookieManager(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-
-  Dali::Toolkit::WebCookieManager* cookieManager = view.GetCookieManager();
-  DALI_TEST_CHECK( cookieManager != 0 );
+  Dali::WebEngineCookieManager* cookieManager = WebView::GetCookieManager();
+  DALI_TEST_CHECK(cookieManager != 0);
 
   END_TEST;
 }
@@ -918,10 +910,10 @@ int UtcDaliWebViewGetWebSettings(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   END_TEST;
 }
@@ -932,13 +924,13 @@ int UtcDaliWebViewProperty1(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   std::string local;
-  view.SetProperty( WebView::Property::URL, TEST_URL1 );
-  Property::Value val = view.GetProperty( WebView::Property::URL );
-  DALI_TEST_CHECK( val.Get( local ) );
-  DALI_TEST_EQUALS( local, TEST_URL1, TEST_LOCATION );
+  view.SetProperty(WebView::Property::URL, TEST_URL1);
+  Property::Value val = view.GetProperty(WebView::Property::URL);
+  DALI_TEST_CHECK(val.Get(local));
+  DALI_TEST_EQUALS(local, TEST_URL1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -949,22 +941,22 @@ int UtcDaliWebViewProperty4(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   const std::string kDefaultValue;
   const std::string kTestValue = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36";
 
   // Check default value
-  std::string output;
-  Property::Value value = view.GetProperty( WebView::Property::USER_AGENT );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kDefaultValue, TEST_LOCATION );
+  std::string     output;
+  Property::Value value = view.GetProperty(WebView::Property::USER_AGENT);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kDefaultValue, TEST_LOCATION);
 
   // Check Set/GetProperty
-  view.SetProperty( WebView::Property::USER_AGENT, kTestValue );
-  value = view.GetProperty( WebView::Property::USER_AGENT );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kTestValue, TEST_LOCATION );
+  view.SetProperty(WebView::Property::USER_AGENT, kTestValue);
+  value = view.GetProperty(WebView::Property::USER_AGENT);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kTestValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -975,28 +967,28 @@ int UtcDaliWebViewProperty9(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // Check default value
   Dali::Vector2 output = Dali::Vector2::ONE;
-  view.GetProperty( WebView::Property::SCROLL_POSITION ).Get( output );
-  DALI_TEST_CHECK( output.x == 0 && output.y == 0 );
+  view.GetProperty(WebView::Property::SCROLL_POSITION).Get(output);
+  DALI_TEST_CHECK(output.x == 0 && output.y == 0);
 
   // Check Set/GetProperty
-  Dali::Vector2 testValue = Dali::Vector2( 100, 100 );
-  view.SetProperty( WebView::Property::SCROLL_POSITION, testValue );
-  view.GetProperty( WebView::Property::SCROLL_POSITION ).Get( output );
-  DALI_TEST_EQUALS( output, testValue, TEST_LOCATION );
+  Dali::Vector2 testValue = Dali::Vector2(100, 100);
+  view.SetProperty(WebView::Property::SCROLL_POSITION, testValue);
+  view.GetProperty(WebView::Property::SCROLL_POSITION).Get(output);
+  DALI_TEST_EQUALS(output, testValue, TEST_LOCATION);
 
   // Check default value of scroll size
   output = Dali::Vector2::ONE;
-  view.GetProperty( WebView::Property::SCROLL_SIZE ).Get( output );
-  DALI_TEST_CHECK( output.x == 500 && output.y == 500 );
+  view.GetProperty(WebView::Property::SCROLL_SIZE).Get(output);
+  DALI_TEST_CHECK(output.x == 500 && output.y == 500);
 
   // Check default value of content size
   output = Dali::Vector2::ONE;
-  view.GetProperty( WebView::Property::CONTENT_SIZE ).Get( output );
-  DALI_TEST_CHECK( output.x == 500 && output.y == 500 );
+  view.GetProperty(WebView::Property::CONTENT_SIZE).Get(output);
+  DALI_TEST_CHECK(output.x == 500 && output.y == 500);
 
   END_TEST;
 }
@@ -1006,7 +998,7 @@ int UtcDaliWebViewPropertyBackgroundColorSelectedTextEtc(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Vector4 testValue = Dali::Vector4(0.0f, 0.0f, 0.0f, 0.0f);
   view.SetProperty(WebView::Property::DOCUMENT_BACKGROUND_COLOR, testValue);
@@ -1027,9 +1019,9 @@ int UtcDaliWebViewPropertyTitleFavicon(void)
 {
   ToolkitTestApplication application;
 
-  char argv[] = "--test";
-  WebView view = WebView::New( 1, (char**)&argv );
-  DALI_TEST_CHECK( view );
+  char    argv[] = "--test";
+  WebView view   = WebView::New(1, (char**)&argv);
+  DALI_TEST_CHECK(view);
 
   // reset something
   view.ClearAllTilesResources();
@@ -1037,18 +1029,18 @@ int UtcDaliWebViewPropertyTitleFavicon(void)
   // Check default value of title
   std::string testValue("title");
   std::string output;
-  view.GetProperty( WebView::Property::TITLE ).Get( output );
-  DALI_TEST_EQUALS( output, testValue, TEST_LOCATION );
+  view.GetProperty(WebView::Property::TITLE).Get(output);
+  DALI_TEST_EQUALS(output, testValue, TEST_LOCATION);
 
   // Check the case that favicon is not null.
   Dali::Toolkit::ImageView favicon = view.GetFavicon();
-  DALI_TEST_CHECK( favicon );
-  Dali::Vector3 iconsize = favicon.GetProperty< Vector3 >( Dali::Actor::Property::SIZE );
-  DALI_TEST_CHECK( ( int )iconsize.width == 2 && ( int )iconsize.height == 2 );
+  DALI_TEST_CHECK(favicon);
+  Dali::Vector3 iconsize = favicon.GetProperty<Vector3>(Dali::Actor::Property::SIZE);
+  DALI_TEST_CHECK((int)iconsize.width == 2 && (int)iconsize.height == 2);
 
   // Check the case that favicon is null.
   favicon = view.GetFavicon();
-  DALI_TEST_CHECK( !favicon );
+  DALI_TEST_CHECK(!favicon);
 
   END_TEST;
 }
@@ -1058,20 +1050,20 @@ int UtcDaliWebViewContextMenuShownAndHidden(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // load url.
-  view.RegisterContextMenuShownCallback( &OnContextMenuShown );
-  view.RegisterContextMenuHiddenCallback( &OnContextMenuHidden );
-  DALI_TEST_EQUALS( gContextMenuShownCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gContextMenuHiddenCallbackCalled, 0, TEST_LOCATION );
+  view.RegisterContextMenuShownCallback(&OnContextMenuShown);
+  view.RegisterContextMenuHiddenCallback(&OnContextMenuHidden);
+  DALI_TEST_EQUALS(gContextMenuShownCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gContextMenuHiddenCallbackCalled, 0, TEST_LOCATION);
   DALI_TEST_CHECK(gContextMenuShownInstance == 0);
   DALI_TEST_CHECK(gContextMenuHiddenInstance == 0);
 
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gContextMenuShownCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gContextMenuHiddenCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gContextMenuShownCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gContextMenuHiddenCallbackCalled, 1, TEST_LOCATION);
 
   // check context meun & its items.
   DALI_TEST_CHECK(gContextMenuShownInstance != 0);
@@ -1100,7 +1092,7 @@ int UtcDaliWebViewContextMenuShownAndHidden(void)
 
   DALI_TEST_CHECK(gContextMenuHiddenInstance != 0);
 
-  gContextMenuShownInstance = nullptr;
+  gContextMenuShownInstance  = nullptr;
   gContextMenuHiddenInstance = nullptr;
 
   END_TEST;
@@ -1111,38 +1103,38 @@ int UtcDaliWebViewScrollBy(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // load url.
-  view.RegisterScrollEdgeReachedCallback( &OnScrollEdgeReached );
-  DALI_TEST_EQUALS( gScrollEdgeReachedCallbackCalled, 0, TEST_LOCATION );
+  view.RegisterScrollEdgeReachedCallback(&OnScrollEdgeReached);
+  DALI_TEST_EQUALS(gScrollEdgeReachedCallbackCalled, 0, TEST_LOCATION);
 
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
   Test::EmitGlobalTimerSignal();
 
   // set scroll position.
-  Dali::Vector2 output = Dali::Vector2::ONE;
-  Dali::Vector2 testValue = Dali::Vector2( 100, 100 );
-  view.SetProperty( WebView::Property::SCROLL_POSITION, testValue );
-  view.GetProperty( WebView::Property::SCROLL_POSITION ).Get( output );
-  DALI_TEST_EQUALS( output, testValue, TEST_LOCATION );
+  Dali::Vector2 output    = Dali::Vector2::ONE;
+  Dali::Vector2 testValue = Dali::Vector2(100, 100);
+  view.SetProperty(WebView::Property::SCROLL_POSITION, testValue);
+  view.GetProperty(WebView::Property::SCROLL_POSITION).Get(output);
+  DALI_TEST_EQUALS(output, testValue, TEST_LOCATION);
 
   // scroll by and trigger scrollEdgeReached event.
-  view.ScrollBy( 50, 50 );
+  view.ScrollBy(50, 50);
   Test::EmitGlobalTimerSignal();
 
-  view.GetProperty( WebView::Property::SCROLL_POSITION ).Get( output );
-  DALI_TEST_CHECK( output.x == 150 && output.y == 150 );
-  DALI_TEST_EQUALS( gScrollEdgeReachedCallbackCalled, 1, TEST_LOCATION );
+  view.GetProperty(WebView::Property::SCROLL_POSITION).Get(output);
+  DALI_TEST_CHECK(output.x == 150 && output.y == 150);
+  DALI_TEST_EQUALS(gScrollEdgeReachedCallbackCalled, 1, TEST_LOCATION);
 
   // scroll by and trigger scrollEdgeReached event.
-  bool result = view.ScrollEdgeBy( 50, 50 );
-  DALI_TEST_CHECK( result );
+  bool result = view.ScrollEdgeBy(50, 50);
+  DALI_TEST_CHECK(result);
   Test::EmitGlobalTimerSignal();
 
-  view.GetProperty( WebView::Property::SCROLL_POSITION ).Get( output );
-  DALI_TEST_CHECK( output.x == 200 && output.y == 200 );
-  DALI_TEST_EQUALS( gScrollEdgeReachedCallbackCalled, 2, TEST_LOCATION );
+  view.GetProperty(WebView::Property::SCROLL_POSITION).Get(output);
+  DALI_TEST_CHECK(output.x == 200 && output.y == 200);
+  DALI_TEST_EQUALS(gScrollEdgeReachedCallbackCalled, 2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1152,29 +1144,29 @@ int UtcDaliWebViewSetGetScaleFactorActivateAccessibility(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
   view.ActivateAccessibility(true);
   view.AddDynamicCertificatePath("host", "test/to/path");
   bool found = view.HighlightText("test", Dali::WebEnginePlugin::FindOption::CASE_INSENSITIVE, 2);
-  DALI_TEST_CHECK( found );
+  DALI_TEST_CHECK(found);
 
   view.SetScaleFactor(1.5f, Dali::Vector2(0.0f, 0.0f));
   float result = view.GetScaleFactor();
-  DALI_TEST_EQUALS( result, 1.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(result, 1.5f, TEST_LOCATION);
 
   view.SetScaleFactor(1.0f, Dali::Vector2(0.0f, 0.0f));
   result = view.GetScaleFactor();
-  DALI_TEST_EQUALS( result, 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(result, 1.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1184,33 +1176,33 @@ int UtcDaliWebViewGetScreenshotSyncAndAsync(void)
   // SCROLL_POSITION
   ToolkitTestApplication application;
 
-  char argv[] = "--test";
-  WebView view = WebView::New( 1, (char**)&argv );
-  DALI_TEST_CHECK( view );
+  char    argv[] = "--test";
+  WebView view   = WebView::New(1, (char**)&argv);
+  DALI_TEST_CHECK(view);
 
   // Check GetScreenshot
   Dali::Rect<int> viewArea;
-  viewArea.x = 100;
-  viewArea.y = 100;
-  viewArea.width = 10;
-  viewArea.height = 10;
+  viewArea.x                          = 100;
+  viewArea.y                          = 100;
+  viewArea.width                      = 10;
+  viewArea.height                     = 10;
   Dali::Toolkit::ImageView screenshot = view.GetScreenshot(viewArea, 1.0f);
-  DALI_TEST_CHECK( screenshot );
-  Dali::Vector3 shotsize = screenshot.GetProperty< Vector3 >( Dali::Actor::Property::SIZE );
-  DALI_TEST_CHECK( ( int )shotsize.width == viewArea.width && ( int )shotsize.height == viewArea.height );
+  DALI_TEST_CHECK(screenshot);
+  Dali::Vector3 shotsize = screenshot.GetProperty<Vector3>(Dali::Actor::Property::SIZE);
+  DALI_TEST_CHECK((int)shotsize.width == viewArea.width && (int)shotsize.height == viewArea.height);
 
   // Check GetScreenshotAsynchronously
-  viewArea.x = 100;
-  viewArea.y = 100;
-  viewArea.width = 100;
+  viewArea.x      = 100;
+  viewArea.y      = 100;
+  viewArea.width  = 100;
   viewArea.height = 100;
-  bool result = view.GetScreenshotAsynchronously(viewArea, 1.0f, &OnScreenshotCaptured);
-  DALI_TEST_CHECK( result );
+  bool result     = view.GetScreenshotAsynchronously(viewArea, 1.0f, &OnScreenshotCaptured);
+  DALI_TEST_CHECK(result);
 
   Test::EmitGlobalTimerSignal();
 
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gScreenshotCapturedCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gScreenshotCapturedCallbackCalled, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1220,20 +1212,20 @@ int UtcDaliWebViewVideoPlayingGeolocationPermission(void)
   // SCROLL_POSITION
   ToolkitTestApplication application;
 
-  char argv[] = "--test";
-  WebView view = WebView::New( 1, (char**)&argv );
-  DALI_TEST_CHECK( view );
+  char    argv[] = "--test";
+  WebView view   = WebView::New(1, (char**)&argv);
+  DALI_TEST_CHECK(view);
 
   // Check CheckVideoPlayingAsynchronously
   bool result = view.CheckVideoPlayingAsynchronously(&OnVideoPlaying);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gVideoPlayingCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gVideoPlayingCallbackCalled, 1, TEST_LOCATION);
 
   // Check RegisterGeolocationPermissionCallback
   view.RegisterGeolocationPermissionCallback(&OnGeolocationPermission);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gGeolocationPermissionCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gGeolocationPermissionCallbackCalled, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1243,16 +1235,16 @@ int UtcDaliWebViewResponsePolicyDecisionRequest(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // load url.
-  view.RegisterResponsePolicyDecidedCallback( &OnResponsePolicyDecided );
-  DALI_TEST_EQUALS( gResponsePolicyDecidedCallbackCalled, 0, TEST_LOCATION );
+  view.RegisterResponsePolicyDecidedCallback(&OnResponsePolicyDecided);
+  DALI_TEST_EQUALS(gResponsePolicyDecidedCallbackCalled, 0, TEST_LOCATION);
   DALI_TEST_CHECK(gResponsePolicyDecisionInstance == 0);
 
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gResponsePolicyDecidedCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gResponsePolicyDecidedCallbackCalled, 1, TEST_LOCATION);
 
   // check response policy decision & its frame.
   DALI_TEST_CHECK(gResponsePolicyDecisionInstance != 0);
@@ -1306,10 +1298,10 @@ int UtcDaliWebViewHitTest(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // load url.
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
 
   // sync hit test.
   std::unique_ptr<Dali::WebEngineHitTest> hitTest = view.CreateHitTest(100, 100, Dali::WebEngineHitTest::HitTestMode::DEFAULT);
@@ -1340,7 +1332,7 @@ int UtcDaliWebViewHitTest(void)
   bool result = view.CreateHitTestAsynchronously(100, 100, Dali::WebEngineHitTest::HitTestMode::DEFAULT, &OnHitTestCreated);
   DALI_TEST_CHECK(result);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gHitTestCreatedCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gHitTestCreatedCallbackCalled, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1349,14 +1341,14 @@ int UtcDaliWebViewEvaluteJavaScript(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New( "ko-KR", "Asia/Seoul" );
+  WebView view = WebView::New("ko-KR", "Asia/Seoul");
 
-  view.LoadHtmlString( "<body>Hello World!</body>" );
-  view.EvaluateJavaScript( "jsObject.postMessage('Hello')" );
-  view.EvaluateJavaScript( "jsObject.postMessage('World')", OnEvaluateJavaScript );
+  view.LoadHtmlString("<body>Hello World!</body>");
+  view.EvaluateJavaScript("jsObject.postMessage('Hello')");
+  view.EvaluateJavaScript("jsObject.postMessage('World')", OnEvaluateJavaScript);
   Test::EmitGlobalTimerSignal();
 
-  DALI_TEST_EQUALS( gEvaluateJavaScriptCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gEvaluateJavaScriptCallbackCalled, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1365,25 +1357,25 @@ int UtcDaliWebViewJavaScriptAlertConfirmPrompt(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New( "ko-KR", "Asia/Seoul" );
+  WebView view = WebView::New("ko-KR", "Asia/Seoul");
 
-  view.RegisterJavaScriptAlertCallback( &OnJavaScriptAlert );
-  view.LoadHtmlString( "<head><script type='text/javascript'>alert('this is an alert popup.');</script></head><body>Hello World!</body>" );
+  view.RegisterJavaScriptAlertCallback(&OnJavaScriptAlert);
+  view.LoadHtmlString("<head><script type='text/javascript'>alert('this is an alert popup.');</script></head><body>Hello World!</body>");
   view.JavaScriptAlertReply();
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gJavaScriptAlertCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gJavaScriptAlertCallbackCalled, 1, TEST_LOCATION);
 
-  view.RegisterJavaScriptConfirmCallback( &OnJavaScriptConfirm );
-  view.LoadHtmlString( "<head><script type='text/javascript'>confirm('this is a confirm popup.');</script></head><body>Hello World!</body>" );
-  view.JavaScriptConfirmReply( true );
+  view.RegisterJavaScriptConfirmCallback(&OnJavaScriptConfirm);
+  view.LoadHtmlString("<head><script type='text/javascript'>confirm('this is a confirm popup.');</script></head><body>Hello World!</body>");
+  view.JavaScriptConfirmReply(true);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gJavaScriptConfirmCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gJavaScriptConfirmCallbackCalled, 1, TEST_LOCATION);
 
-  view.RegisterJavaScriptPromptCallback( &OnJavaScriptPrompt );
-  view.LoadHtmlString( "<head><script type='text/javascript'>prompt('this is a prompt popup.');</script></head><body>Hello World!</body>" );
-  view.JavaScriptPromptReply( "it is a prompt." );
+  view.RegisterJavaScriptPromptCallback(&OnJavaScriptPrompt);
+  view.LoadHtmlString("<head><script type='text/javascript'>prompt('this is a prompt popup.');</script></head><body>Hello World!</body>");
+  view.JavaScriptPromptReply("it is a prompt.");
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gJavaScriptPromptCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gJavaScriptPromptCallbackCalled, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1392,21 +1384,21 @@ int UtcDaliWebViewLoadHtmlStringOverrideCurrentEntryAndContents(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New( "ko-KR", "Asia/Seoul" );
-  DALI_TEST_CHECK( view );
+  WebView view = WebView::New("ko-KR", "Asia/Seoul");
+  DALI_TEST_CHECK(view);
 
   std::string html("<body>Hello World!</body>");
   std::string basicUri("http://basicurl");
   std::string unreachableUrl("http://unreachableurl");
-  bool result = view.LoadHtmlStringOverrideCurrentEntry( html, basicUri, unreachableUrl );
-  DALI_TEST_CHECK( result );
+  bool        result = view.LoadHtmlStringOverrideCurrentEntry(html, basicUri, unreachableUrl);
+  DALI_TEST_CHECK(result);
 
   application.SendNotification();
   application.Render();
   Test::EmitGlobalTimerSignal();
 
-  result = view.LoadContents( html, html.length(), "html/text", "utf-8", basicUri );
-  DALI_TEST_CHECK( result );
+  result = view.LoadContents(html, html.length(), "html/text", "utf-8", basicUri);
+  DALI_TEST_CHECK(result);
 
   END_TEST;
 }
@@ -1416,37 +1408,37 @@ int UtcDaliWebViewReloadSuspendResumeNetworkLoadingCustomHeader(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.LoadUrl( "http://test.html" );
+  view.LoadUrl("http://test.html");
   bool result = view.AddCustomHeader("key", "value");
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   result = view.ReloadWithoutCache();
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   uint32_t portNumber = view.StartInspectorServer(5000);
-  DALI_TEST_EQUALS( portNumber, 5000, TEST_LOCATION );
+  DALI_TEST_EQUALS(portNumber, 5000, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
   Test::EmitGlobalTimerSignal();
 
   result = view.StopInspectorServer();
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   view.SuspendNetworkLoading();
 
   result = view.RemoveCustomHeader("key");
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   view.ResumeNetworkLoading();
 
@@ -1457,16 +1449,15 @@ int UtcDaliWebViewMethodsForCoverage(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New( "ko-KR", "Asia/Seoul" );
+  WebView view = WebView::New("ko-KR", "Asia/Seoul");
 
-  view.LoadHtmlString( "<body>Hello World!</body>" );
-  view.AddJavaScriptMessageHandler( "jsObject",
-    []( const std::string& arg ) {
-    }
-  );
+  view.LoadHtmlString("<body>Hello World!</body>");
+  view.AddJavaScriptMessageHandler("jsObject",
+                                   [](const std::string& arg) {
+                                   });
   view.SetTtsFocus(true);
 
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
@@ -1478,67 +1469,64 @@ int UtcDaliWebBackForwardListCheckItem(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebBackForwardList* bfList = view.GetBackForwardList();
-  DALI_TEST_CHECK( bfList != 0 )
+  DALI_TEST_CHECK(bfList != 0)
 
   unsigned int itemCount = bfList->GetItemCount();
-  DALI_TEST_CHECK( itemCount == 1 )
+  DALI_TEST_CHECK(itemCount == 1)
 
   std::unique_ptr<Dali::WebEngineBackForwardListItem> citem = bfList->GetCurrentItem();
-  DALI_TEST_CHECK( citem != 0 );
+  DALI_TEST_CHECK(citem != 0);
 
   std::unique_ptr<Dali::WebEngineBackForwardListItem> citemP = bfList->GetPreviousItem();
-  DALI_TEST_CHECK( citemP != 0 );
+  DALI_TEST_CHECK(citemP != 0);
 
   std::unique_ptr<Dali::WebEngineBackForwardListItem> citemN = bfList->GetNextItem();
-  DALI_TEST_CHECK( citemN != 0 );
+  DALI_TEST_CHECK(citemN != 0);
 
-  const std::string kDefaultUrl( "http://url" );
-  std::string testValue = citem->GetUrl();
-  DALI_TEST_EQUALS( testValue, kDefaultUrl, TEST_LOCATION );
+  const std::string kDefaultUrl("http://url");
+  std::string       testValue = citem->GetUrl();
+  DALI_TEST_EQUALS(testValue, kDefaultUrl, TEST_LOCATION);
 
-  const std::string kDefaultTitle( "title" );
+  const std::string kDefaultTitle("title");
   testValue = citem->GetTitle();
-  DALI_TEST_EQUALS( testValue, kDefaultTitle, TEST_LOCATION );
+  DALI_TEST_EQUALS(testValue, kDefaultTitle, TEST_LOCATION);
 
-  const std::string kDefaultOriginalUrl( "http://originalurl" );
+  const std::string kDefaultOriginalUrl("http://originalurl");
   testValue = citem->GetOriginalUrl();
-  DALI_TEST_EQUALS( testValue, kDefaultOriginalUrl, TEST_LOCATION );
+  DALI_TEST_EQUALS(testValue, kDefaultOriginalUrl, TEST_LOCATION);
 
-  std::unique_ptr<Dali::WebEngineBackForwardListItem> item = bfList->GetItemAtIndex( 0 );
-  DALI_TEST_CHECK( item != 0 );
+  std::unique_ptr<Dali::WebEngineBackForwardListItem> item = bfList->GetItemAtIndex(0);
+  DALI_TEST_CHECK(item != 0);
 
   std::vector<std::unique_ptr<Dali::WebEngineBackForwardListItem>> vecBack = bfList->GetBackwardItems(-1);
-  DALI_TEST_CHECK( vecBack.size() == 1 );
+  DALI_TEST_CHECK(vecBack.size() == 1);
 
   std::vector<std::unique_ptr<Dali::WebEngineBackForwardListItem>> vecForward = bfList->GetForwardItems(-1);
-  DALI_TEST_CHECK( vecForward.size() == 1 );
+  DALI_TEST_CHECK(vecForward.size() == 1);
 
   END_TEST;
 }
 
 // test cases for web context.
 
-int UtcDaliWebContextGetSetCacheModel(void)
+int UtcDaliWebContextGetSetCacheModelEtc(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-
-  Dali::Toolkit::WebContext* context = view.GetContext();
-  DALI_TEST_CHECK( context != 0 )
+  Dali::WebEngineContext* context = WebView::GetContext();
+  DALI_TEST_CHECK(context != 0)
 
   std::string kDefaultValue;
 
   // Reset something
-  context->SetAppId( "id" );
-  context->SetApplicationType( Dali::WebEngineContext::ApplicationType::OTHER );
-  context->SetTimeOffset( 0 );
-  context->SetTimeZoneOffset( 0, 0 );
-  context->SetDefaultProxyAuth( kDefaultValue, kDefaultValue );
+  context->SetAppId("id");
+  context->SetApplicationType(Dali::WebEngineContext::ApplicationType::OTHER);
+  context->SetTimeOffset(0);
+  context->SetTimeZoneOffset(0, 0);
+  context->SetDefaultProxyAuth(kDefaultValue, kDefaultValue);
   context->DeleteAllWebDatabase();
   context->DeleteAllWebStorage();
   context->DeleteLocalFileSystem();
@@ -1548,47 +1536,47 @@ int UtcDaliWebContextGetSetCacheModel(void)
 
   // Check default value
   Dali::WebEngineContext::CacheModel value = context->GetCacheModel();
-  DALI_TEST_CHECK( value == Dali::WebEngineContext::CacheModel::DOCUMENT_VIEWER );
+  DALI_TEST_CHECK(value == Dali::WebEngineContext::CacheModel::DOCUMENT_VIEWER);
 
   // Check Set/GetProperty
-  context->SetCacheModel( Dali::WebEngineContext::CacheModel::DOCUMENT_BROWSER );
+  context->SetCacheModel(Dali::WebEngineContext::CacheModel::DOCUMENT_BROWSER);
   value = context->GetCacheModel();
-  DALI_TEST_CHECK( value == Dali::WebEngineContext::CacheModel::DOCUMENT_BROWSER );
+  DALI_TEST_CHECK(value == Dali::WebEngineContext::CacheModel::DOCUMENT_BROWSER);
 
   // Get cache enabled
-  context->EnableCache( true );
-  DALI_TEST_CHECK( context->IsCacheEnabled() );
+  context->EnableCache(true);
+  DALI_TEST_CHECK(context->IsCacheEnabled());
 
   // Get certificate
-  context->SetCertificateFilePath( "test" );
+  context->SetCertificateFilePath("test");
   std::string str = context->GetCertificateFilePath();
-  DALI_TEST_EQUALS( str, "test", TEST_LOCATION );
+  DALI_TEST_EQUALS(str, "test", TEST_LOCATION);
 
   // Set version
-  DALI_TEST_CHECK( context->SetAppVersion( "test" ) );
+  DALI_TEST_CHECK(context->SetAppVersion("test"));
 
   // Register
   std::vector<std::string> temp;
-  context->RegisterUrlSchemesAsCorsEnabled( temp );
-  context->RegisterJsPluginMimeTypes( temp );
-  context->DeleteFormPasswordDataList( temp );
+  context->RegisterUrlSchemesAsCorsEnabled(temp);
+  context->RegisterJsPluginMimeTypes(temp);
+  context->DeleteFormPasswordDataList(temp);
 
   // Get zoom factor
-  context->SetDefaultZoomFactor( 1.0f );
-  DALI_TEST_EQUALS( context->GetDefaultZoomFactor(), float( 1.0f ), TEST_LOCATION );
+  context->SetDefaultZoomFactor(1.0f);
+  DALI_TEST_EQUALS(context->GetDefaultZoomFactor(), float(1.0f), TEST_LOCATION);
 
   // Delete cache and database
-  DALI_TEST_CHECK( context->DeleteAllApplicationCache() );
-  DALI_TEST_CHECK( context->DeleteAllWebIndexedDatabase() );
+  DALI_TEST_CHECK(context->DeleteAllApplicationCache());
+  DALI_TEST_CHECK(context->DeleteAllWebIndexedDatabase());
 
   // Get contextProxy
-  context->SetProxyUri( "test" );
-  DALI_TEST_EQUALS( context->GetProxyUri(), "test", TEST_LOCATION );
+  context->SetProxyUri("test");
+  DALI_TEST_EQUALS(context->GetProxyUri(), "test", TEST_LOCATION);
   context->SetProxyBypassRule("", "test");
-  DALI_TEST_EQUALS( context->GetProxyBypassRule(), "test", TEST_LOCATION );
+  DALI_TEST_EQUALS(context->GetProxyBypassRule(), "test", TEST_LOCATION);
 
   //Notify low memory
-  DALI_TEST_CHECK( context->FreeUnusedMemory() );
+  DALI_TEST_CHECK(context->FreeUnusedMemory());
 
   END_TEST;
 }
@@ -1597,49 +1585,46 @@ int UtcDaliWebContextGetWebDatabaseStorageOrigins(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-
-  Dali::Toolkit::WebContext* context = view.GetContext();
-  DALI_TEST_CHECK( context != 0 )
+  Dali::WebEngineContext* context = WebView::GetContext();
+  DALI_TEST_CHECK(context != 0)
 
   std::string kDefaultValue;
 
   // get origins of web database
   bool result = context->GetWebDatabaseOrigins(&OnSecurityOriginsAcquired);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gSecurityOriginsAcquiredCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gSecurityOriginsAcquiredCallbackCalled, 1, TEST_LOCATION);
   DALI_TEST_CHECK(gSecurityOriginList.size() == 1);
 
   Dali::WebEngineSecurityOrigin* origin = gSecurityOriginList[0].get();
-  DALI_TEST_CHECK( origin );
+  DALI_TEST_CHECK(origin);
 
   result = context->DeleteWebDatabase(*origin);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   // get origins of web storage
   result = context->GetWebStorageOrigins(&OnSecurityOriginsAcquired);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gSecurityOriginsAcquiredCallbackCalled, 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(gSecurityOriginsAcquiredCallbackCalled, 2, TEST_LOCATION);
   DALI_TEST_CHECK(gSecurityOriginList.size() == 1);
 
   origin = gSecurityOriginList[0].get();
-  DALI_TEST_CHECK( origin );
+  DALI_TEST_CHECK(origin);
 
   result = context->GetWebStorageUsageForOrigin(*origin, &OnStorageUsageAcquired);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gStorageUsageAcquiredCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gStorageUsageAcquiredCallbackCalled, 1, TEST_LOCATION);
 
   result = context->DeleteWebStorage(*origin);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   result = context->DeleteApplicationCache(*origin);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   // form passwords, download state, mime type.
   context->GetFormPasswordList(&OnFormPasswordsAcquired);
@@ -1667,11 +1652,14 @@ int UtcDaliWebContextHttpRequestInterceptor(void)
 {
   ToolkitTestApplication application;
 
+  Dali::WebEngineContext* context = WebView::GetContext();
+  DALI_TEST_CHECK(context != 0)
+
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  Dali::Toolkit::WebContext* context = view.GetContext();
-  DALI_TEST_CHECK( context != 0 )
+  // Check if web view is found or not when plugin is null.
+  DALI_TEST_CHECK(!WebView::FindWebView(nullptr));
 
   // load url.
   context->RegisterRequestInterceptedCallback(&OnRequestIntercepted);
@@ -1679,7 +1667,7 @@ int UtcDaliWebContextHttpRequestInterceptor(void)
   DALI_TEST_CHECK(!gRequestInterceptorInstance);
 
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gRequestInterceptedCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gRequestInterceptedCallbackCalled, 1, TEST_LOCATION);
 
   // check request interceptor.
   DALI_TEST_CHECK(gRequestInterceptorInstance);
@@ -1689,9 +1677,14 @@ int UtcDaliWebContextHttpRequestInterceptor(void)
   Dali::Property::Map testHeaders;
   testHeaders.Insert("key2", "value2");
   DALI_TEST_CHECK(gRequestInterceptorInstance->AddResponseHeaders(testHeaders));
-  DALI_TEST_CHECK(gRequestInterceptorInstance->AddResponseBody("test", 4));
-  DALI_TEST_CHECK(gRequestInterceptorInstance->AddResponse("key:value", "test", 4));
-  DALI_TEST_CHECK(gRequestInterceptorInstance->WriteResponseChunk("test", 4));
+  DALI_TEST_CHECK(gRequestInterceptorInstance->AddResponseBody((const int8_t*)"test", 4));
+  DALI_TEST_CHECK(gRequestInterceptorInstance->AddResponse("key:value", (const int8_t*)"test", 4));
+  DALI_TEST_CHECK(gRequestInterceptorInstance->WriteResponseChunk((const int8_t*)"test", 4));
+
+  DALI_TEST_CHECK(gRequestInterceptorInstance->GetWebEngine());
+  // Check if web view is found or not when plugin is not null.
+  DALI_TEST_CHECK(WebView::FindWebView(gRequestInterceptorInstance->GetWebEngine()));
+
   std::string testUrl("http://test.html");
   DALI_TEST_EQUALS(gRequestInterceptorInstance->GetUrl(), testUrl, TEST_LOCATION);
   std::string testMethod("GET");
@@ -1699,6 +1692,8 @@ int UtcDaliWebContextHttpRequestInterceptor(void)
   Dali::Property::Map resultHeaders = gRequestInterceptorInstance->GetHeaders();
   DALI_TEST_EQUALS(resultHeaders.Count(), 2, TEST_LOCATION);
 
+  // Destroy web view.
+  view.Reset();
   gRequestInterceptorInstance = nullptr;
 
   END_TEST;
@@ -1710,26 +1705,23 @@ int UtcDaliWebCookieManagerGetSetCookieAcceptPolicy(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-
-  Dali::Toolkit::WebCookieManager* cookieManager = view.GetCookieManager();
-  DALI_TEST_CHECK( cookieManager != 0 )
+  Dali::WebEngineCookieManager* cookieManager = WebView::GetCookieManager();
+  DALI_TEST_CHECK(cookieManager != 0)
 
   const std::string kDefaultValue;
 
   // Reset something
-  cookieManager->SetPersistentStorage( kDefaultValue, Dali::WebEngineCookieManager::CookiePersistentStorage::SQLITE );
+  cookieManager->SetPersistentStorage(kDefaultValue, Dali::WebEngineCookieManager::CookiePersistentStorage::SQLITE);
   cookieManager->ClearCookies();
 
   // Check default value
   Dali::WebEngineCookieManager::CookieAcceptPolicy value = cookieManager->GetCookieAcceptPolicy();
-  DALI_TEST_CHECK( value == Dali::WebEngineCookieManager::CookieAcceptPolicy::NO_THIRD_PARTY );
+  DALI_TEST_CHECK(value == Dali::WebEngineCookieManager::CookieAcceptPolicy::NO_THIRD_PARTY);
 
   // Check Set/GetProperty
-  cookieManager->SetCookieAcceptPolicy( Dali::WebEngineCookieManager::CookieAcceptPolicy::ALWAYS );
+  cookieManager->SetCookieAcceptPolicy(Dali::WebEngineCookieManager::CookieAcceptPolicy::ALWAYS);
   value = cookieManager->GetCookieAcceptPolicy();
-  DALI_TEST_CHECK( value == Dali::WebEngineCookieManager::CookieAcceptPolicy::ALWAYS );
+  DALI_TEST_CHECK(value == Dali::WebEngineCookieManager::CookieAcceptPolicy::ALWAYS);
 
   END_TEST;
 }
@@ -1738,15 +1730,12 @@ int UtcDaliWebCookieManagerChangesWatch(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-
-  Dali::Toolkit::WebCookieManager* cookieManager = view.GetCookieManager();
-  DALI_TEST_CHECK( cookieManager != 0 )
+  Dali::WebEngineCookieManager* cookieManager = WebView::GetCookieManager();
+  DALI_TEST_CHECK(cookieManager != 0)
 
   cookieManager->ChangesWatch(&OnChangesWatch);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gCookieManagerChangsWatchCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gCookieManagerChangsWatchCallbackCalled, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1758,29 +1747,29 @@ int UtcDaliWebSettingsGetSetDefaultFontSize(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value
   int value = settings->GetDefaultFontSize();
-  DALI_TEST_CHECK( value == 16 );
+  DALI_TEST_CHECK(value == 16);
 
   // Check Set/GetProperty
-  settings->SetDefaultFontSize( 20 );
+  settings->SetDefaultFontSize(20);
   value = settings->GetDefaultFontSize();
-  DALI_TEST_CHECK( value == 20 );
+  DALI_TEST_CHECK(value == 20);
 
   END_TEST;
 }
@@ -1790,29 +1779,29 @@ int UtcDaliWebSettingsCheckEnableJavaScript(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsJavaScriptEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->EnableJavaScript( false );
+  settings->EnableJavaScript(false);
   value = settings->IsJavaScriptEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -1822,29 +1811,29 @@ int UtcDaliWebSettingsCheckEnableAutoFitting(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsAutoFittingEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->EnableAutoFitting( false );
+  settings->EnableAutoFitting(false);
   value = settings->IsAutoFittingEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -1854,29 +1843,29 @@ int UtcDaliWebSettingsCheckEnablePlugins(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->ArePluginsEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->EnablePlugins( false );
+  settings->EnablePlugins(false);
   value = settings->ArePluginsEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -1886,29 +1875,29 @@ int UtcDaliWebSettingsCheckEnablePrivateBrowsing(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsPrivateBrowsingEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->EnablePrivateBrowsing( false );
+  settings->EnablePrivateBrowsing(false);
   value = settings->IsPrivateBrowsingEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -1918,29 +1907,29 @@ int UtcDaliWebSettingsCheckEnableLinkMagnifier(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsLinkMagnifierEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->EnableLinkMagnifier( false );
+  settings->EnableLinkMagnifier(false);
   value = settings->IsLinkMagnifierEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -1950,29 +1939,29 @@ int UtcDaliWebSettingsCheckUseKeypadWithoutUserAction(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsKeypadWithoutUserActionUsed();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->UseKeypadWithoutUserAction( false );
+  settings->UseKeypadWithoutUserAction(false);
   value = settings->IsKeypadWithoutUserActionUsed();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -1982,27 +1971,27 @@ int UtcDaliWebSettingsCheckEnableAutofillPasswordForm(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsAutofillPasswordFormEnabled();
-  DALI_TEST_CHECK( value );
-  settings->EnableAutofillPasswordForm( false );
+  DALI_TEST_CHECK(value);
+  settings->EnableAutofillPasswordForm(false);
   value = settings->IsAutofillPasswordFormEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
   END_TEST;
 }
 
@@ -2011,29 +2000,29 @@ int UtcDaliWebSettingsCheckEnableFormCandidateData(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsFormCandidateDataEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->EnableFormCandidateData( false );
+  settings->EnableFormCandidateData(false);
   value = settings->IsFormCandidateDataEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -2043,29 +2032,29 @@ int UtcDaliWebSettingsCheckEnableTextSelection(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsTextSelectionEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   //Check Set/GetProperty
   settings->EnableTextSelection(false);
   value = settings->IsTextSelectionEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -2075,29 +2064,29 @@ int UtcDaliWebSettingsCheckEnableTextAutosizing(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsTextAutosizingEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
   settings->EnableTextAutosizing(false);
   value = settings->IsTextAutosizingEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -2107,29 +2096,29 @@ int UtcDaliWebSettingsCheckEnableArrowScroll(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsArrowScrollEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
   settings->EnableArrowScroll(false);
   value = settings->IsArrowScrollEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -2139,27 +2128,27 @@ int UtcDaliWebSettingsCheckEnableClipboard(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsClipboardEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
   settings->EnableClipboard(false);
   value = settings->IsClipboardEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
   END_TEST;
 }
 
@@ -2168,29 +2157,29 @@ int UtcDaliWebSettingsCheckEnableImePanel(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsImePanelEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
   settings->EnableImePanel(false);
   value = settings->IsImePanelEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -2200,29 +2189,29 @@ int UtcDaliWebSettingsCheckAllowImagesLoadAutomatically(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->AreImagesLoadedAutomatically();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->AllowImagesLoadAutomatically( false );
+  settings->AllowImagesLoadAutomatically(false);
   value = settings->AreImagesLoadedAutomatically();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -2232,32 +2221,32 @@ int UtcDaliWebSettingsGetSetDefaultTextEncodingName(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   const std::string kDefaultValue;
   const std::string kTestValue = "UTF-8";
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value
   std::string value = settings->GetDefaultTextEncodingName();
-  DALI_TEST_EQUALS( value, kDefaultValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(value, kDefaultValue, TEST_LOCATION);
 
   // Check Set/GetProperty
-  settings->SetDefaultTextEncodingName( kTestValue );
+  settings->SetDefaultTextEncodingName(kTestValue);
   value = settings->GetDefaultTextEncodingName();
-  DALI_TEST_EQUALS( value, kTestValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(value, kTestValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2267,14 +2256,14 @@ int UtcDaliWebSettingsSetViewportMetaTag(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Check the value is true or not
   bool value = settings->SetViewportMetaTag(true);
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   END_TEST;
 }
@@ -2284,17 +2273,17 @@ int UtcDaliWebSettingsSetForceZoom(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Check the value is true or not
   bool value = settings->SetForceZoom(true);
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   value = settings->IsZoomForced();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   END_TEST;
 }
@@ -2304,17 +2293,17 @@ int UtcDaliWebSettingsSetTextZoomEnabled(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Check the value is true or not
   bool value = settings->SetTextZoomEnabled(true);
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   value = settings->IsTextZoomEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   END_TEST;
 }
@@ -2324,15 +2313,15 @@ int UtcDaliWebSettingsSetExtraFeature(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Check the value is true or not
   settings->SetExtraFeature("test", true);
   bool value = settings->IsExtraFeatureEnabled("test");
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   END_TEST;
 }