From: Piotr Kosko/Native/Web API (PLT) /SRPOL/Engineer/Samsung Electronics <p.kosko@samsung.com>
Date: Thu, 5 Dec 2019 13:57:16 +0000 (+0100)
Subject: [Code format] Fixed formating with auto-format tool
X-Git-Tag: accepted/tizen/5.5/unified/20200221.094157~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c9e72150a6c94802d593a6c523344b93b461f10;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[Code format] Fixed formating with auto-format tool

* added ignoring "src/google" directories in code_format script

Change-Id: If843a91d21bb558b8354c09e2832cb3d4934ea26
---

diff --git a/src/account/account_instance.cc b/src/account/account_instance.cc
index 287aa64..f746ec9 100644
--- a/src/account/account_instance.cc
+++ b/src/account/account_instance.cc
@@ -55,16 +55,12 @@ AccountInstance::AccountInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-
-
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&AccountInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&AccountInstance::M, this, _1, _2))
 
   REGISTER_METHOD(AccountManagerGetAccounts);
   REGISTER_METHOD(AccountManagerGetProviders);
   REGISTER_METHOD(AccountGetExtendedData);
 
-
   REGISTER_METHOD(AccountManagerRemoveAccountListener);
   REGISTER_METHOD(AccountManagerUpdate);
   REGISTER_METHOD(AccountManagerRemove);
@@ -76,7 +72,6 @@ AccountInstance::AccountInstance() {
   REGISTER_METHOD(AccountGetExtendedDataSync);
 
 #undef REGISTER_METHOD
-
 }
 
 AccountInstance::~AccountInstance() {
diff --git a/src/alarm/alarm_instance.cc b/src/alarm/alarm_instance.cc
index e9c52f0..7a8012f 100644
--- a/src/alarm/alarm_instance.cc
+++ b/src/alarm/alarm_instance.cc
@@ -28,8 +28,7 @@ AlarmInstance::AlarmInstance() {
   ScopeLogger();
   using namespace std::placeholders;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&AlarmInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&AlarmInstance::M, this, _1, _2))
 
   REGISTER_METHOD(AlarmManagerAdd);
   REGISTER_METHOD(AlarmManagerRemove);
@@ -47,7 +46,7 @@ AlarmInstance::AlarmInstance() {
 #if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
   REGISTER_METHOD(AlarmManagerAddAlarmNotification);
   REGISTER_METHOD(AlarmManagerGetAlarmNotification);
-#endif // TIZEN_MOBILE or TIZEN_WEARABLE
+#endif  // TIZEN_MOBILE or TIZEN_WEARABLE
 
 #undef REGISTER_METHOD
 }
@@ -56,54 +55,56 @@ AlarmInstance::~AlarmInstance() {
   ScopeLogger();
 }
 
-
 void AlarmInstance::AlarmManagerAdd(const picojson::value& args, picojson::object& out) {
-    ScopeLogger();
-    manager_.Add(args, out);
+  ScopeLogger();
+  manager_.Add(args, out);
 }
 
 void AlarmInstance::AlarmManagerRemove(const picojson::value& args, picojson::object& out) {
-    ScopeLogger();
-    manager_.Remove(args, out);
+  ScopeLogger();
+  manager_.Remove(args, out);
 }
 
 void AlarmInstance::AlarmManagerRemoveAll(const picojson::value& args, picojson::object& out) {
-    ScopeLogger();
-    manager_.RemoveAll(args, out);
+  ScopeLogger();
+  manager_.RemoveAll(args, out);
 }
 
 void AlarmInstance::AlarmManagerGet(const picojson::value& args, picojson::object& out) {
-    ScopeLogger();
-    manager_.Get(args, out);
+  ScopeLogger();
+  manager_.Get(args, out);
 }
 
 void AlarmInstance::AlarmManagerGetAll(const picojson::value& args, picojson::object& out) {
-    ScopeLogger();
-    manager_.GetAll(args, out);
+  ScopeLogger();
+  manager_.GetAll(args, out);
 }
 
 #if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
-void AlarmInstance::AlarmManagerAddAlarmNotification(const picojson::value& args, picojson::object& out) {
-    ScopeLogger();
-    manager_.AddAlarmNotification(args, out);
+void AlarmInstance::AlarmManagerAddAlarmNotification(const picojson::value& args,
+                                                     picojson::object& out) {
+  ScopeLogger();
+  manager_.AddAlarmNotification(args, out);
 }
 
-void AlarmInstance::AlarmManagerGetAlarmNotification(const picojson::value& args, picojson::object& out) {
-    ScopeLogger();
-    manager_.GetAlarmNotification(args, out);
+void AlarmInstance::AlarmManagerGetAlarmNotification(const picojson::value& args,
+                                                     picojson::object& out) {
+  ScopeLogger();
+  manager_.GetAlarmNotification(args, out);
 }
-#endif // TIZEN_MOBILE or TIZEN_WEARABLE
+#endif  // TIZEN_MOBILE or TIZEN_WEARABLE
 
-void AlarmInstance::AlarmManagerGetRemainingSeconds(const picojson::value& args, picojson::object& out) {
-    ScopeLogger();
-    manager_.GetRemainingSeconds(args, out);
+void AlarmInstance::AlarmManagerGetRemainingSeconds(const picojson::value& args,
+                                                    picojson::object& out) {
+  ScopeLogger();
+  manager_.GetRemainingSeconds(args, out);
 }
 
-void AlarmInstance::AlarmManagerGetNextScheduledDate(const picojson::value& args, picojson::object& out) {
-    ScopeLogger();
-    manager_.GetNextScheduledDate(args, out);
+void AlarmInstance::AlarmManagerGetNextScheduledDate(const picojson::value& args,
+                                                     picojson::object& out) {
+  ScopeLogger();
+  manager_.GetNextScheduledDate(args, out);
 }
 
-
 }  // namespace Alarm
 }  // namespace extension
diff --git a/src/application/application_instance.cc b/src/application/application_instance.cc
index 6d1f793..e709709 100644
--- a/src/application/application_instance.cc
+++ b/src/application/application_instance.cc
@@ -51,8 +51,7 @@ ApplicationInstance::ApplicationInstance() : manager_(*this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&ApplicationInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&ApplicationInstance::M, this, _1, _2))
 
   // ApplicationManager
   REGISTER_METHOD(ApplicationManagerGetCurrentApplication);
@@ -98,19 +97,21 @@ ApplicationInstance::~ApplicationInstance() {
 }
 
 void ApplicationInstance::ApplicationManagerGetCurrentApplication(const picojson::value& args,
-                                                picojson::object& out) {
+                                                                  picojson::object& out) {
   ScopeLogger();
 
   manager_.GetCurrentApplication(app_id_, &out);
 }
 
-void ApplicationInstance::ApplicationManagerGetAppContext(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppContext(const picojson::value& args,
+                                                          picojson::object& out) {
   ScopeLogger();
 
   manager_.GetAppContext(args, &out);
 }
 
-void ApplicationInstance::ApplicationManagerGetAppInfo(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppInfo(const picojson::value& args,
+                                                       picojson::object& out) {
   ScopeLogger();
 
   std::string app_id = app_id_;
@@ -122,7 +123,8 @@ void ApplicationInstance::ApplicationManagerGetAppInfo(const picojson::value& ar
   manager_.GetAppInfo(app_id, &out);
 }
 
-void ApplicationInstance::ApplicationManagerGetAppCerts(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppCerts(const picojson::value& args,
+                                                        picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeAppManagerCertificate, &out);
@@ -136,7 +138,8 @@ void ApplicationInstance::ApplicationManagerGetAppCerts(const picojson::value& a
   manager_.GetAppCerts(app_id, &out);
 }
 
-void ApplicationInstance::ApplicationManagerGetAppSharedURI(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppSharedURI(const picojson::value& args,
+                                                            picojson::object& out) {
   ScopeLogger();
 
   std::string app_id = app_id_;
@@ -148,7 +151,8 @@ void ApplicationInstance::ApplicationManagerGetAppSharedURI(const picojson::valu
   manager_.GetAppSharedUri(app_id, &out);
 }
 
-void ApplicationInstance::ApplicationManagerGetAppMetaData(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppMetaData(const picojson::value& args,
+                                                           picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeApplicationInfo, &out);
@@ -162,14 +166,16 @@ void ApplicationInstance::ApplicationManagerGetAppMetaData(const picojson::value
   manager_.GetAppMetaData(app_id, &out);
 }
 
-void ApplicationInstance::ApplicationManagerGetBatteryUsageInfo(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetBatteryUsageInfo(const picojson::value& args,
+                                                                picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeAppHistoryRead, &out);
 
   manager_.GetBatteryUsageInfo(args, &out);
 }
 
-void ApplicationInstance::ApplicationManagerGetAppsUsageInfo(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppsUsageInfo(const picojson::value& args,
+                                                             picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeAppHistoryRead, &out);
 
@@ -177,7 +183,7 @@ void ApplicationInstance::ApplicationManagerGetAppsUsageInfo(const picojson::val
 }
 
 void ApplicationInstance::ApplicationManagerAddAppInfoEventListener(const picojson::value& args,
-                                                  picojson::object& out) {
+                                                                    picojson::object& out) {
   ScopeLogger();
   LoggerW(
       "DEPRECATION WARNING: addAppInfoEventListener() is deprecated and will be removed from next "
@@ -188,7 +194,7 @@ void ApplicationInstance::ApplicationManagerAddAppInfoEventListener(const picojs
 }
 
 void ApplicationInstance::ApplicationManagerRemoveAppInfoEventListener(const picojson::value& args,
-                                                     picojson::object& out) {
+                                                                       picojson::object& out) {
   ScopeLogger();
   LoggerW(
       "DEPRECATION WARNING: removeAppInfoEventListener() is deprecated and will be removed from "
@@ -200,25 +206,28 @@ void ApplicationInstance::ApplicationManagerRemoveAppInfoEventListener(const pic
 }
 
 void ApplicationInstance::ApplicationGetRequestedAppControl(const picojson::value& args,
-                                                 picojson::object& out) {
+                                                            picojson::object& out) {
   ScopeLogger();
 
   current_application_.GetRequestedAppControl(args, &out);
 }
 
-void ApplicationInstance::RequestedApplicationControlReplyResult(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::RequestedApplicationControlReplyResult(const picojson::value& args,
+                                                                 picojson::object& out) {
   ScopeLogger();
 
   current_application_.app_control().ReplyResult(args, &out);
 }
 
-void ApplicationInstance::RequestedApplicationControlReplyFailure(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::RequestedApplicationControlReplyFailure(const picojson::value& args,
+                                                                  picojson::object& out) {
   ScopeLogger();
 
   current_application_.app_control().ReplyFailure(&out);
 }
 
-void ApplicationInstance::ApplicationInformationGetSize(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationInformationGetSize(const picojson::value& args,
+                                                        picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeApplicationInfo, &out);
@@ -226,7 +235,8 @@ void ApplicationInstance::ApplicationInformationGetSize(const picojson::value& a
   manager_.GetApplicationInformationSize(args, &out);
 }
 
-void ApplicationInstance::ApplicationManagerKill(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerKill(const picojson::value& args,
+                                                 picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeAppManagerKill, &out);
@@ -234,7 +244,8 @@ void ApplicationInstance::ApplicationManagerKill(const picojson::value& args, pi
   manager_.Kill(args);
 }
 
-void ApplicationInstance::ApplicationManagerLaunch(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerLaunch(const picojson::value& args,
+                                                   picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeApplicationLaunch, &out);
@@ -242,7 +253,8 @@ void ApplicationInstance::ApplicationManagerLaunch(const picojson::value& args,
   manager_.Launch(args);
 }
 
-void ApplicationInstance::ApplicationManagerLaunchAppControl(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerLaunchAppControl(const picojson::value& args,
+                                                             picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeApplicationLaunch, &out);
@@ -250,38 +262,43 @@ void ApplicationInstance::ApplicationManagerLaunchAppControl(const picojson::val
   manager_.LaunchAppControl(args);
 }
 
-void ApplicationInstance::ApplicationManagerFindAppControl(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerFindAppControl(const picojson::value& args,
+                                                           picojson::object& out) {
   ScopeLogger();
 
   manager_.FindAppControl(args);
 }
 
-void ApplicationInstance::ApplicationManagerGetAppsContext(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppsContext(const picojson::value& args,
+                                                           picojson::object& out) {
   ScopeLogger();
 
   manager_.GetAppsContext(args);
 }
 
-void ApplicationInstance::ApplicationManagerGetAppsInfo(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppsInfo(const picojson::value& args,
+                                                        picojson::object& out) {
   ScopeLogger();
 
   manager_.GetAppsInfo(args);
 }
 
-void ApplicationInstance::ApplicationBroadcastEvent(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationBroadcastEvent(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
 
   manager_.BroadcastEventHelper(args, out, false);
 }
 
 void ApplicationInstance::ApplicationBroadcastTrustedEvent(const picojson::value& args,
-                                                picojson::object& out) {
+                                                           picojson::object& out) {
   ScopeLogger();
 
   manager_.BroadcastEventHelper(args, out, true);
 }
 
-void ApplicationInstance::ApplicationAddEventListener(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationAddEventListener(const picojson::value& args,
+                                                      picojson::object& out) {
   ScopeLogger();
 
   const std::string& event_name = args.get("name").get<std::string>();
@@ -304,7 +321,8 @@ void ApplicationInstance::ApplicationAddEventListener(const picojson::value& arg
   }
 }
 
-void ApplicationInstance::ApplicationRemoveEventListener(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationRemoveEventListener(const picojson::value& args,
+                                                         picojson::object& out) {
   ScopeLogger();
 
   const std::string& event_name = args.get("name").get<std::string>();
@@ -314,7 +332,8 @@ void ApplicationInstance::ApplicationRemoveEventListener(const picojson::value&
   manager_.StopEventListener(event_name);
 }
 
-void ApplicationInstance::ApplicationManagerAddStatusListener(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerAddStatusListener(const picojson::value& args,
+                                                              picojson::object& out) {
   ScopeLogger();
 
   JsonCallback cb = [this](picojson::value* event) -> void {
@@ -329,7 +348,8 @@ void ApplicationInstance::ApplicationManagerAddStatusListener(const picojson::va
   }
 }
 
-void ApplicationInstance::ApplicationManagerRemoveStatusListener(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerRemoveStatusListener(const picojson::value& args,
+                                                                 picojson::object& out) {
   ScopeLogger();
 
   PlatformResult result = manager_.StopStatusChangeListener();
diff --git a/src/application/application_instance.h b/src/application/application_instance.h
index 852aa75..06f0d52 100644
--- a/src/application/application_instance.h
+++ b/src/application/application_instance.h
@@ -33,7 +33,8 @@ class ApplicationInstance : public common::ParsedInstance {
   virtual ~ApplicationInstance();
 
  private:
-  void ApplicationManagerAddAppInfoEventListener(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerAddAppInfoEventListener(const picojson::value& args,
+                                                 picojson::object& out);
   void ApplicationManagerAddStatusListener(const picojson::value& args, picojson::object& out);
   void ApplicationManagerFindAppControl(const picojson::value& args, picojson::object& out);
   void ApplicationManagerGetAppCerts(const picojson::value& args, picojson::object& out);
@@ -49,7 +50,8 @@ class ApplicationInstance : public common::ParsedInstance {
   void ApplicationManagerKill(const picojson::value& args, picojson::object& out);
   void ApplicationManagerLaunch(const picojson::value& args, picojson::object& out);
   void ApplicationManagerLaunchAppControl(const picojson::value& args, picojson::object& out);
-  void ApplicationManagerRemoveAppInfoEventListener(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerRemoveAppInfoEventListener(const picojson::value& args,
+                                                    picojson::object& out);
   void ApplicationManagerRemoveStatusListener(const picojson::value& args, picojson::object& out);
 
   void ApplicationAddEventListener(const picojson::value& args, picojson::object& out);
diff --git a/src/badge/badge_instance.cc b/src/badge/badge_instance.cc
index 728a08b..8249f74 100644
--- a/src/badge/badge_instance.cc
+++ b/src/badge/badge_instance.cc
@@ -36,10 +36,7 @@ BadgeInstance::BadgeInstance() : manager_(*this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-
-
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&BadgeInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&BadgeInstance::M, this, _1, _2))
 
   REGISTER_METHOD(BadgeManagerSetBadgeCount);
   REGISTER_METHOD(BadgeManagerAddChangeListener);
@@ -47,7 +44,6 @@ BadgeInstance::BadgeInstance() : manager_(*this) {
   REGISTER_METHOD(BadgeManagerGetBadgeCount);
 
 #undef REGISTER_METHOD
-
 }
 
 BadgeInstance::~BadgeInstance() {
diff --git a/src/bluetooth/bluetooth_instance.cc b/src/bluetooth/bluetooth_instance.cc
index 2af4a37..3cf8ef5 100644
--- a/src/bluetooth/bluetooth_instance.cc
+++ b/src/bluetooth/bluetooth_instance.cc
@@ -41,8 +41,7 @@ BluetoothInstance::BluetoothInstance()
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&BluetoothInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&BluetoothInstance::M, this, _1, _2))
 
   REGISTER_METHOD(BluetoothAdapterSetName);
   REGISTER_METHOD(BluetoothAdapterSetPowered);
@@ -165,132 +164,158 @@ void BluetoothInstance::FireEvent(const std::string& event,
   FireEvent(event, *value.get());
 }
 
-void BluetoothInstance::BluetoothAdapterSetName(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterSetName(const picojson::value& args,
+                                                picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.SetName(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterSetPowered(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterSetPowered(const picojson::value& args,
+                                                   picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.SetPowered(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterSetVisible(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterSetVisible(const picojson::value& args,
+                                                   picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.SetVisible(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterDiscoverDevices(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterDiscoverDevices(const picojson::value& args,
+                                                        picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.DiscoverDevices(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterStopDiscovery(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterStopDiscovery(const picojson::value& args,
+                                                      picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.StopDiscovery(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterGetKnownDevices(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterGetKnownDevices(const picojson::value& args,
+                                                        picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.GetKnownDevices(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterGetDevice(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterGetDevice(const picojson::value& args,
+                                                  picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.GetDevice(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterCreateBonding(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterCreateBonding(const picojson::value& args,
+                                                      picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.CreateBonding(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterDestroyBonding(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterDestroyBonding(const picojson::value& args,
+                                                       picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.DestroyBonding(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterRegisterRFCOMMServiceByUUID(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterRegisterRFCOMMServiceByUUID(const picojson::value& args,
+                                                                    picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.RegisterRFCOMMServiceByUUID(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterGetBluetoothProfileHandler(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterGetBluetoothProfileHandler(const picojson::value& args,
+                                                                   picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.GetBluetoothProfileHandler(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterGetName(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterGetName(const picojson::value& args,
+                                                picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.GetName(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterGetAddress(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterGetAddress(const picojson::value& args,
+                                                   picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.GetAddress(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterGetPowered(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterGetPowered(const picojson::value& args,
+                                                   picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.GetPowered(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterGetVisible(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterGetVisible(const picojson::value& args,
+                                                   picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.GetVisible(args, out);
 }
 
-void BluetoothInstance::BluetoothAdapterIsServiceConnected(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothAdapterIsServiceConnected(const picojson::value& args,
+                                                           picojson::object& out) {
   ScopeLogger();
   bluetooth_adapter_.IsServiceConnected(args, out);
 }
 
-void BluetoothInstance::BluetoothDeviceConnectToServiceByUUID(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothDeviceConnectToServiceByUUID(const picojson::value& args,
+                                                              picojson::object& out) {
   ScopeLogger();
   bluetooth_device_.ConnectToServiceByUUID(args, out);
 }
 
-void BluetoothInstance::BluetoothDeviceGetBoolValue(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothDeviceGetBoolValue(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
   bluetooth_device_.GetBoolValue(args, out);
 }
 
-void BluetoothInstance::BluetoothHealthApplicationUnregister(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothHealthApplicationUnregister(const picojson::value& args,
+                                                             picojson::object& out) {
   ScopeLogger();
   bluetooth_health_application_.Unregister(args, out);
 }
 
-void BluetoothInstance::BluetoothHealthChannelClose(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothHealthChannelClose(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
   bluetooth_health_channel_.Close(args, out);
 }
 
-void BluetoothInstance::BluetoothHealthChannelSendData(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothHealthChannelSendData(const picojson::value& args,
+                                                       picojson::object& out) {
   ScopeLogger();
   bluetooth_health_channel_.SendData(args, out);
 }
 
-void BluetoothInstance::BluetoothHealthProfileHandlerRegisterSinkApp(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothHealthProfileHandlerRegisterSinkApp(const picojson::value& args,
+                                                                     picojson::object& out) {
   ScopeLogger();
   bluetooth_health_profile_handler_.RegisterSinkApp(args, out);
 }
 
-void BluetoothInstance::BluetoothHealthProfileHandlerConnectToSource(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothHealthProfileHandlerConnectToSource(const picojson::value& args,
+                                                                     picojson::object& out) {
   ScopeLogger();
   bluetooth_health_profile_handler_.ConnectToSource(args, out);
 }
 
-void BluetoothInstance::BluetoothServiceHandlerUnregister(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothServiceHandlerUnregister(const picojson::value& args,
+                                                          picojson::object& out) {
   ScopeLogger();
   bluetooth_service_handler_.Unregister(args, out);
 }
 
-void BluetoothInstance::BluetoothSocketWriteData(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothSocketWriteData(const picojson::value& args,
+                                                 picojson::object& out) {
   ScopeLogger();
   bluetooth_socket_.WriteData(args, out);
 }
 
-void BluetoothInstance::BluetoothSocketReadData(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothSocketReadData(const picojson::value& args,
+                                                picojson::object& out) {
   ScopeLogger();
   bluetooth_socket_.ReadData(args, out);
 }
@@ -300,82 +325,98 @@ void BluetoothInstance::BluetoothSocketClose(const picojson::value& args, picojs
   bluetooth_socket_.Close(args, out);
 }
 
-void BluetoothInstance::BluetoothLEAdapterStartScan(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothLEAdapterStartScan(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
   bluetooth_le_adapter_.StartScan(args, out);
 }
 
-void BluetoothInstance::BluetoothLEAdapterStopScan(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothLEAdapterStopScan(const picojson::value& args,
+                                                   picojson::object& out) {
   ScopeLogger();
   bluetooth_le_adapter_.StopScan(args, out);
 }
 
-void BluetoothInstance::BluetoothLEAdapterStartAdvertise(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothLEAdapterStartAdvertise(const picojson::value& args,
+                                                         picojson::object& out) {
   ScopeLogger();
   bluetooth_le_adapter_.StartAdvertise(args, out);
 }
 
-void BluetoothInstance::BluetoothLEAdapterStopAdvertise(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothLEAdapterStopAdvertise(const picojson::value& args,
+                                                        picojson::object& out) {
   ScopeLogger();
   bluetooth_le_adapter_.StopAdvertise(args, out);
 }
 
-void BluetoothInstance::BluetoothLEDeviceConnect(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothLEDeviceConnect(const picojson::value& args,
+                                                 picojson::object& out) {
   ScopeLogger();
   bluetooth_le_device_.Connect(args, out);
 }
 
-void BluetoothInstance::BluetoothLEDeviceDisconnect(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothLEDeviceDisconnect(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
   bluetooth_le_device_.Disconnect(args, out);
 }
 
-void BluetoothInstance::BluetoothLEDeviceGetService(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothLEDeviceGetService(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
   bluetooth_le_device_.GetService(args, out);
 }
 
-void BluetoothInstance::BluetoothLEDeviceAddConnectStateChangeListener(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothLEDeviceAddConnectStateChangeListener(const picojson::value& args,
+                                                                       picojson::object& out) {
   ScopeLogger();
   bluetooth_le_device_.AddConnectStateChangeListener(args, out);
 }
 
-void BluetoothInstance::BluetoothLEDeviceRemoveConnectStateChangeListener(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothLEDeviceRemoveConnectStateChangeListener(
+    const picojson::value& args, picojson::object& out) {
   ScopeLogger();
   bluetooth_le_device_.RemoveConnectStateChangeListener(args, out);
 }
 
-void BluetoothInstance::BluetoothLEDeviceGetServiceAllUuids(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothLEDeviceGetServiceAllUuids(const picojson::value& args,
+                                                            picojson::object& out) {
   ScopeLogger();
   bluetooth_le_device_.GetServiceAllUuids(args, out);
 }
 
-void BluetoothInstance::BluetoothGATTServiceGetServices(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothGATTServiceGetServices(const picojson::value& args,
+                                                        picojson::object& out) {
   ScopeLogger();
   bluetooth_gatt_service_.GetServices(args, out);
 }
 
-void BluetoothInstance::BluetoothGATTServiceGetCharacteristics(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothGATTServiceGetCharacteristics(const picojson::value& args,
+                                                               picojson::object& out) {
   ScopeLogger();
   bluetooth_gatt_service_.GetCharacteristics(args, out);
 }
 
-void BluetoothInstance::BluetoothGATTServiceReadValue(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothGATTServiceReadValue(const picojson::value& args,
+                                                      picojson::object& out) {
   ScopeLogger();
   bluetooth_gatt_service_.ReadValue(args, out);
 }
 
-void BluetoothInstance::BluetoothGATTServiceWriteValue(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothGATTServiceWriteValue(const picojson::value& args,
+                                                       picojson::object& out) {
   ScopeLogger();
   bluetooth_gatt_service_.WriteValue(args, out);
 }
 
-void BluetoothInstance::BluetoothGATTServiceAddValueChangeListener(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothGATTServiceAddValueChangeListener(const picojson::value& args,
+                                                                   picojson::object& out) {
   ScopeLogger();
   bluetooth_gatt_service_.AddValueChangeListener(args, out);
 }
 
-void BluetoothInstance::BluetoothGATTServiceRemoveValueChangeListener(const picojson::value& args, picojson::object& out) {
+void BluetoothInstance::BluetoothGATTServiceRemoveValueChangeListener(const picojson::value& args,
+                                                                      picojson::object& out) {
   ScopeLogger();
   bluetooth_gatt_service_.RemoveValueChangeListener(args, out);
 }
diff --git a/src/bluetooth/bluetooth_instance.h b/src/bluetooth/bluetooth_instance.h
index b6d207b..1301216 100644
--- a/src/bluetooth/bluetooth_instance.h
+++ b/src/bluetooth/bluetooth_instance.h
@@ -57,8 +57,10 @@ class BluetoothInstance : public common::ParsedInstance {
   void BluetoothAdapterGetDevice(const picojson::value& args, picojson::object& out);
   void BluetoothAdapterCreateBonding(const picojson::value& args, picojson::object& out);
   void BluetoothAdapterDestroyBonding(const picojson::value& args, picojson::object& out);
-  void BluetoothAdapterRegisterRFCOMMServiceByUUID(const picojson::value& args, picojson::object& out);
-  void BluetoothAdapterGetBluetoothProfileHandler(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterRegisterRFCOMMServiceByUUID(const picojson::value& args,
+                                                   picojson::object& out);
+  void BluetoothAdapterGetBluetoothProfileHandler(const picojson::value& args,
+                                                  picojson::object& out);
   void BluetoothAdapterGetName(const picojson::value& args, picojson::object& out);
   void BluetoothAdapterGetAddress(const picojson::value& args, picojson::object& out);
   void BluetoothAdapterGetPowered(const picojson::value& args, picojson::object& out);
@@ -71,8 +73,10 @@ class BluetoothInstance : public common::ParsedInstance {
   void BluetoothHealthApplicationUnregister(const picojson::value& args, picojson::object& out);
   void BluetoothHealthChannelClose(const picojson::value& args, picojson::object& out);
   void BluetoothHealthChannelSendData(const picojson::value& args, picojson::object& out);
-  void BluetoothHealthProfileHandlerRegisterSinkApp(const picojson::value& args, picojson::object& out);
-  void BluetoothHealthProfileHandlerConnectToSource(const picojson::value& args, picojson::object& out);
+  void BluetoothHealthProfileHandlerRegisterSinkApp(const picojson::value& args,
+                                                    picojson::object& out);
+  void BluetoothHealthProfileHandlerConnectToSource(const picojson::value& args,
+                                                    picojson::object& out);
 
   void BluetoothServiceHandlerUnregister(const picojson::value& args, picojson::object& out);
   void BluetoothSocketWriteData(const picojson::value& args, picojson::object& out);
@@ -86,16 +90,20 @@ class BluetoothInstance : public common::ParsedInstance {
   void BluetoothLEDeviceConnect(const picojson::value& args, picojson::object& out);
   void BluetoothLEDeviceDisconnect(const picojson::value& args, picojson::object& out);
   void BluetoothLEDeviceGetService(const picojson::value& args, picojson::object& out);
-  void BluetoothLEDeviceAddConnectStateChangeListener(const picojson::value& args, picojson::object& out);
-  void BluetoothLEDeviceRemoveConnectStateChangeListener(const picojson::value& args, picojson::object& out);
+  void BluetoothLEDeviceAddConnectStateChangeListener(const picojson::value& args,
+                                                      picojson::object& out);
+  void BluetoothLEDeviceRemoveConnectStateChangeListener(const picojson::value& args,
+                                                         picojson::object& out);
   void BluetoothLEDeviceGetServiceAllUuids(const picojson::value& args, picojson::object& out);
 
   void BluetoothGATTServiceGetServices(const picojson::value& args, picojson::object& out);
   void BluetoothGATTServiceGetCharacteristics(const picojson::value& args, picojson::object& out);
   void BluetoothGATTServiceReadValue(const picojson::value& args, picojson::object& out);
   void BluetoothGATTServiceWriteValue(const picojson::value& args, picojson::object& out);
-  void BluetoothGATTServiceAddValueChangeListener(const picojson::value& args, picojson::object& out);
-  void BluetoothGATTServiceRemoveValueChangeListener(const picojson::value& args, picojson::object& out);
+  void BluetoothGATTServiceAddValueChangeListener(const picojson::value& args,
+                                                  picojson::object& out);
+  void BluetoothGATTServiceRemoveValueChangeListener(const picojson::value& args,
+                                                     picojson::object& out);
 
   BluetoothAdapter bluetooth_adapter_;
   BluetoothDevice bluetooth_device_;
diff --git a/src/bookmark/bookmark_instance.cc b/src/bookmark/bookmark_instance.cc
index 306fe98..6340294 100644
--- a/src/bookmark/bookmark_instance.cc
+++ b/src/bookmark/bookmark_instance.cc
@@ -47,8 +47,7 @@ BookmarkInstance::BookmarkInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&BookmarkInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&BookmarkInstance::M, this, _1, _2))
 
   REGISTER_METHOD(BookmarkGet);
   REGISTER_METHOD(BookmarkAdd);
diff --git a/src/calendar/calendar_instance.cc b/src/calendar/calendar_instance.cc
index 3b438e0..a7068ff 100644
--- a/src/calendar/calendar_instance.cc
+++ b/src/calendar/calendar_instance.cc
@@ -44,8 +44,7 @@ CalendarInstance::CalendarInstance() : calendar_(*this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&CalendarInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&CalendarInstance::M, this, _1, _2))
 
   REGISTER_METHOD(CalendarGet);
   REGISTER_METHOD(CalendarAdd);
diff --git a/src/callhistory/callhistory_instance.cc b/src/callhistory/callhistory_instance.cc
index e8ba341..d5c48d3 100644
--- a/src/callhistory/callhistory_instance.cc
+++ b/src/callhistory/callhistory_instance.cc
@@ -37,8 +37,7 @@ CallHistoryInstance::CallHistoryInstance() : history_(*this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&CallHistoryInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&CallHistoryInstance::M, this, _1, _2))
 
   REGISTER_METHOD(CallHistoryRemove);
   REGISTER_METHOD(CallHistoryAddChangeListener);
@@ -74,7 +73,8 @@ void CallHistoryInstance::CallHistoryRemove(const picojson::value& args, picojso
   }
 }
 
-void CallHistoryInstance::CallHistoryRemoveBatch(const picojson::value& args, picojson::object& out) {
+void CallHistoryInstance::CallHistoryRemoveBatch(const picojson::value& args,
+                                                 picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryWrite, &out);
   PlatformResult result = history_.removeBatch(args.get<picojson::object>());
@@ -92,7 +92,8 @@ void CallHistoryInstance::CallHistoryRemoveAll(const picojson::value& args, pico
   ReportSuccess(out);
 }
 
-void CallHistoryInstance::CallHistoryAddChangeListener(const picojson::value& args, picojson::object& out) {
+void CallHistoryInstance::CallHistoryAddChangeListener(const picojson::value& args,
+                                                       picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryRead, &out);
   PlatformResult result = history_.startCallHistoryChangeListener();
@@ -103,7 +104,8 @@ void CallHistoryInstance::CallHistoryAddChangeListener(const picojson::value& ar
   }
 }
 
-void CallHistoryInstance::CallHistoryRemoveChangeListener(const picojson::value& args, picojson::object& out) {
+void CallHistoryInstance::CallHistoryRemoveChangeListener(const picojson::value& args,
+                                                          picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryRead, &out);
   PlatformResult result = history_.stopCallHistoryChangeListener();
@@ -114,7 +116,8 @@ void CallHistoryInstance::CallHistoryRemoveChangeListener(const picojson::value&
   }
 }
 
-void CallHistoryInstance::CallHistorySetMissedDirection(const picojson::value& args, picojson::object& out) {
+void CallHistoryInstance::CallHistorySetMissedDirection(const picojson::value& args,
+                                                        picojson::object& out) {
   ScopeLogger();
 
   if (!args.contains("uid")) {
diff --git a/src/contact/contact_instance.cc b/src/contact/contact_instance.cc
index 3b3b1e6..2e21abd 100644
--- a/src/contact/contact_instance.cc
+++ b/src/contact/contact_instance.cc
@@ -66,8 +66,7 @@ ContactInstance::ContactInstance() : current_state_(0), is_listening_(false) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&ContactInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&ContactInstance::M, this, _1, _2))
 
   REGISTER_METHOD(ContactManagerGetAddressBooks);
   REGISTER_METHOD(ContactManagerGetAddressBook);
diff --git a/src/content/content_instance.cc b/src/content/content_instance.cc
index 884ecfd..24861b6 100644
--- a/src/content/content_instance.cc
+++ b/src/content/content_instance.cc
@@ -56,8 +56,7 @@ ContentInstance::ContentInstance()
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&ContentInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&ContentInstance::M, this, _1, _2))
 
   REGISTER_METHOD(ContentManagerFind);
   REGISTER_METHOD(ContentManagerUpdate);
diff --git a/src/datacontrol/datacontrol_instance.cc b/src/datacontrol/datacontrol_instance.cc
index d7617c3..d98aa44 100644
--- a/src/datacontrol/datacontrol_instance.cc
+++ b/src/datacontrol/datacontrol_instance.cc
@@ -83,8 +83,7 @@ DatacontrolInstance::DatacontrolInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&DatacontrolInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&DatacontrolInstance::M, this, _1, _2))
 
   REGISTER_METHOD(SQLDataControlConsumerUpdate);
   REGISTER_METHOD(MappedDataControlConsumerAddValue);
@@ -494,7 +493,7 @@ int DatacontrolInstance::RunSQLDataControlJob(const std::string& providerId,
   }
 
 void DatacontrolInstance::DataControlManagerGetConsumer(const picojson::value& args,
-                                                                   picojson::object& out) {
+                                                        picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out);
 
@@ -1094,7 +1093,8 @@ void DatacontrolInstance::result_callback(data_control_h provider, data_control_
   }
 }
 
-void DatacontrolInstance::DataControlConsumerObjectAddChangeListener(const picojson::value& args, picojson::object& out) {
+void DatacontrolInstance::DataControlConsumerObjectAddChangeListener(const picojson::value& args,
+                                                                     picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeDatasharing, &out);
@@ -1119,8 +1119,10 @@ void DatacontrolInstance::DataControlConsumerObjectAddChangeListener(const picoj
   }
 
   if (DATA_CONTROL_ERROR_NONE != result) {
-    LogAndReportError(ServiceNotAvailableException("DataControlConsumerObjectAddChangeListener failed"), out,
-                      ("DataControlConsumerObjectAddChangeListener failed: %d (%s)", result, get_error_message(result)));
+    LogAndReportError(
+        ServiceNotAvailableException("DataControlConsumerObjectAddChangeListener failed"), out,
+        ("DataControlConsumerObjectAddChangeListener failed: %d (%s)", result,
+         get_error_message(result)));
     return;
   }
 
@@ -1135,8 +1137,10 @@ void DatacontrolInstance::DataControlConsumerObjectAddChangeListener(const picoj
                                              user_data.get(), &watch_id);
 
   if (DATA_CONTROL_ERROR_NONE != result) {
-    LogAndReportError(ServiceNotAvailableException("DataControlConsumerObjectAddChangeListener failed"), out,
-                      ("DataControlConsumerObjectAddChangeListener failed: %d (%s)", result, get_error_message(result)));
+    LogAndReportError(
+        ServiceNotAvailableException("DataControlConsumerObjectAddChangeListener failed"), out,
+        ("DataControlConsumerObjectAddChangeListener failed: %d (%s)", result,
+         get_error_message(result)));
     return;
   }
 
@@ -1149,7 +1153,8 @@ void DatacontrolInstance::DataControlConsumerObjectAddChangeListener(const picoj
   ReportSuccess(return_value, out);
 }
 
-void DatacontrolInstance::DataControlConsumerObjectRemoveChangeListener(const picojson::value& args, picojson::object& out) {
+void DatacontrolInstance::DataControlConsumerObjectRemoveChangeListener(const picojson::value& args,
+                                                                        picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeDatasharing, &out);
@@ -1159,8 +1164,9 @@ void DatacontrolInstance::DataControlConsumerObjectRemoveChangeListener(const pi
 
   int watch_id = static_cast<int>(args.get("watchId").get<double>());
   if (reply_map.end() == reply_map.find(watch_id)) {
-    LogAndReportError(IOException("DataControlConsumerObjectRemoveChangeListener failed"), out,
-                      ("DataControlConsumerObjectRemoveChangeListener failed, watch_id: %d", watch_id));
+    LogAndReportError(
+        IOException("DataControlConsumerObjectRemoveChangeListener failed"), out,
+        ("DataControlConsumerObjectRemoveChangeListener failed, watch_id: %d", watch_id));
     return;
   }
   data_control_h handle = reply_map[watch_id]->handle;
@@ -1171,7 +1177,8 @@ void DatacontrolInstance::DataControlConsumerObjectRemoveChangeListener(const pi
     // According to native documentation only IOError can be returned to webapi, other errors are
     // handled earlier
     LogAndReportError(IOException("DataControlConsumerObjectRemoveChangeListener failed"), out,
-                      ("DataControlConsumerObjectRemoveChangeListener failed: %d (%s)", result, get_error_message(result)));
+                      ("DataControlConsumerObjectRemoveChangeListener failed: %d (%s)", result,
+                       get_error_message(result)));
     return;
   }
 
diff --git a/src/datacontrol/datacontrol_instance.h b/src/datacontrol/datacontrol_instance.h
index 1a4f200..2816770 100644
--- a/src/datacontrol/datacontrol_instance.h
+++ b/src/datacontrol/datacontrol_instance.h
@@ -79,8 +79,10 @@ class DatacontrolInstance : public common::ParsedInstance {
   void MappedDataControlConsumerRemoveValue(const picojson::value& args, picojson::object& out);
   void MappedDataControlConsumerGetValue(const picojson::value& args, picojson::object& out);
   void MappedDataControlConsumerUpdateValue(const picojson::value& args, picojson::object& out);
-  void DataControlConsumerObjectAddChangeListener(const picojson::value& args, picojson::object& out);
-  void DataControlConsumerObjectRemoveChangeListener(const picojson::value& args, picojson::object& out);
+  void DataControlConsumerObjectAddChangeListener(const picojson::value& args,
+                                                  picojson::object& out);
+  void DataControlConsumerObjectRemoveChangeListener(const picojson::value& args,
+                                                     picojson::object& out);
 
   ReplyCallbackDataMap reply_map;
 };
diff --git a/src/download/download_instance.cc b/src/download/download_instance.cc
index 0625e22..49905f5 100644
--- a/src/download/download_instance.cc
+++ b/src/download/download_instance.cc
@@ -45,9 +45,7 @@ DownloadInstance::DownloadInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&DownloadInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&DownloadInstance::M, this, _1, _2))
 
   REGISTER_METHOD(DownloadManagerGetMimeType);
   REGISTER_METHOD(DownloadManagerStart);
@@ -59,7 +57,6 @@ DownloadInstance::DownloadInstance() {
 
 #undef REGISTER_METHOD
 
-
   std::lock_guard<std::mutex> lock(instances_mutex_);
   instances_.push_back(this);
 }
diff --git a/src/exif/exif_instance.cc b/src/exif/exif_instance.cc
index 6454370..b0cf17c 100644
--- a/src/exif/exif_instance.cc
+++ b/src/exif/exif_instance.cc
@@ -46,8 +46,7 @@ ExifInstance::ExifInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&ExifInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&ExifInstance::M, this, _1, _2))
 
   REGISTER_METHOD(ExifManagerGetExifInfo);
   REGISTER_METHOD(ExifManagerSaveExifInfo);
diff --git a/src/feedback/feedback_instance.cc b/src/feedback/feedback_instance.cc
index c1fa714..9815054 100644
--- a/src/feedback/feedback_instance.cc
+++ b/src/feedback/feedback_instance.cc
@@ -49,23 +49,21 @@ FeedbackInstance::FeedbackInstance()
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&FeedbackInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&FeedbackInstance::M, this, _1, _2))
 
   REGISTER_METHOD(FeedbackManagerIsPatternSupported);
   REGISTER_METHOD(FeedbackManagerPlay);
   REGISTER_METHOD(FeedbackManagerStop);
 
 #undef REGISTER_METHOD
-
 }
 
 FeedbackInstance::~FeedbackInstance() {
   ScopeLogger();
 }
 
-void FeedbackInstance::FeedbackManagerIsPatternSupported(const picojson::value& args, picojson::object& out) {
+void FeedbackInstance::FeedbackManagerIsPatternSupported(const picojson::value& args,
+                                                         picojson::object& out) {
   ScopeLogger();
 
   const auto pattern = args.get("pattern").get<std::string>();
diff --git a/src/iotcon/iotcon_instance.cc b/src/iotcon/iotcon_instance.cc
index 0bb0423..640a659 100644
--- a/src/iotcon/iotcon_instance.cc
+++ b/src/iotcon/iotcon_instance.cc
@@ -172,8 +172,7 @@ IotconInstance::IotconInstance()
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&IotconInstance::M, this, _1))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&IotconInstance::M, this, _1))
 
   REGISTER_METHOD(IotconResourceGetObserverIds);
   REGISTER_METHOD(IotconResourceNotify);
@@ -212,8 +211,7 @@ IotconInstance::IotconInstance()
   REGISTER_METHOD(IotconClientFindPlatformInfo);
 #undef REGISTER_METHOD
 
-#define REGISTER_METHOD(M) \
-    RegisterHandler(#M, std::bind(&IotconInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterHandler(#M, std::bind(&IotconInstance::M, this, _1, _2))
 
   REGISTER_METHOD(IotconRemoteResourceMethodGet);
   REGISTER_METHOD(IotconRemoteResourceMethodPut);
@@ -371,7 +369,8 @@ common::TizenResult IotconInstance::IotconResourceAddResourceTypes(const picojso
   return common::TizenSuccess();
 }
 
-common::TizenResult IotconInstance::IotconResourceAddResourceInterface(const picojson::object& args) {
+common::TizenResult IotconInstance::IotconResourceAddResourceInterface(
+    const picojson::object& args) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeIotcon);
@@ -429,7 +428,8 @@ common::TizenResult IotconInstance::IotconResourceAddChildResource(const picojso
   return common::TizenSuccess();
 }
 
-common::TizenResult IotconInstance::IotconResourceRemoveChildResource(const picojson::object& args) {
+common::TizenResult IotconInstance::IotconResourceRemoveChildResource(
+    const picojson::object& args) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeIotcon);
@@ -492,7 +492,8 @@ common::TizenResult IotconInstance::IotconResourceSetRequestListener(const picoj
   return common::TizenSuccess();
 }
 
-common::TizenResult IotconInstance::IotconResourceUnsetRequestListener(const picojson::object& args) {
+common::TizenResult IotconInstance::IotconResourceUnsetRequestListener(
+    const picojson::object& args) {
   ScopeLogger();
 
   CHECK_EXIST(args, kId);
@@ -674,7 +675,7 @@ common::TizenResult IotconInstance::IotconRemoteResourceSetOptions(const picojso
 }
 
 common::TizenResult IotconInstance::IotconRemoteResourceMethodGet(const picojson::object& args,
-                                                            const common::AsyncToken& token) {
+                                                                  const common::AsyncToken& token) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeIotcon);
@@ -735,7 +736,7 @@ common::TizenResult IotconInstance::IotconRemoteResourceMethodGet(const picojson
 }
 
 common::TizenResult IotconInstance::IotconRemoteResourceMethodPut(const picojson::object& args,
-                                                            const common::AsyncToken& token) {
+                                                                  const common::AsyncToken& token) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeIotcon);
@@ -807,8 +808,8 @@ common::TizenResult IotconInstance::IotconRemoteResourceMethodPut(const picojson
   return common::TizenSuccess{IotconClientManager::GetInstance().StoreRemoteResource(resource)};
 }
 
-common::TizenResult IotconInstance::IotconRemoteResourceMethodPost(const picojson::object& args,
-                                                             const common::AsyncToken& token) {
+common::TizenResult IotconInstance::IotconRemoteResourceMethodPost(
+    const picojson::object& args, const common::AsyncToken& token) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeIotcon);
@@ -880,8 +881,8 @@ common::TizenResult IotconInstance::IotconRemoteResourceMethodPost(const picojso
   return common::TizenSuccess{IotconClientManager::GetInstance().StoreRemoteResource(resource)};
 }
 
-common::TizenResult IotconInstance::IotconRemoteResourceMethodDelete(const picojson::object& args,
-                                                               const common::AsyncToken& token) {
+common::TizenResult IotconInstance::IotconRemoteResourceMethodDelete(
+    const picojson::object& args, const common::AsyncToken& token) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeIotcon);
@@ -951,7 +952,8 @@ static void ObserveCallback(iotcon_remote_resource_h resource, iotcon_error_e er
   }
 }
 
-common::TizenResult IotconInstance::IotconRemoteResourceStartObserving(const picojson::object& args) {
+common::TizenResult IotconInstance::IotconRemoteResourceStartObserving(
+    const picojson::object& args) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeIotcon);
@@ -1025,7 +1027,8 @@ common::TizenResult IotconInstance::IotconRemoteResourceStartObserving(const pic
   return common::TizenSuccess{ret};
 }
 
-common::TizenResult IotconInstance::IotconRemoteResourceStopObserving(const picojson::object& args) {
+common::TizenResult IotconInstance::IotconRemoteResourceStopObserving(
+    const picojson::object& args) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeIotcon);
@@ -1249,7 +1252,8 @@ common::TizenResult IotconInstance::IotconRemoteResourceUnsetResourceStateChange
   return common::TizenSuccess{IotconClientManager::GetInstance().RemoveRemoteResource(ptr)};
 }
 
-common::TizenResult IotconInstance::IotconRemoteResourceGetTimeInterval(const picojson::object& args) {
+common::TizenResult IotconInstance::IotconRemoteResourceGetTimeInterval(
+    const picojson::object& args) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeIotcon);
@@ -1270,7 +1274,8 @@ common::TizenResult IotconInstance::IotconRemoteResourceGetTimeInterval(const pi
   return common::TizenSuccess{picojson::value(static_cast<double>(time_interval))};
 }
 
-common::TizenResult IotconInstance::IotconRemoteResourceSetTimeInterval(const picojson::object& args) {
+common::TizenResult IotconInstance::IotconRemoteResourceSetTimeInterval(
+    const picojson::object& args) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeIotcon);
@@ -1405,7 +1410,8 @@ common::TizenResult IotconInstance::IotconClientFindResource(const picojson::obj
   return common::TizenSuccess();
 }
 
-common::TizenResult IotconInstance::IotconClientAddPresenceEventListener(const picojson::object& args) {
+common::TizenResult IotconInstance::IotconClientAddPresenceEventListener(
+    const picojson::object& args) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeIotcon);
diff --git a/src/iotcon/iotcon_instance.h b/src/iotcon/iotcon_instance.h
index 4f70b12..48e5b90 100644
--- a/src/iotcon/iotcon_instance.h
+++ b/src/iotcon/iotcon_instance.h
@@ -49,19 +49,21 @@ class IotconInstance : public common::TizenInstance {
   common::TizenResult IotconRemoteResourceGetOptions(const picojson::object& args);
   common::TizenResult IotconRemoteResourceSetOptions(const picojson::object& args);
   common::TizenResult IotconRemoteResourceMethodGet(const picojson::object& args,
-                                              const common::AsyncToken& token);
+                                                    const common::AsyncToken& token);
   common::TizenResult IotconRemoteResourceMethodPut(const picojson::object& args,
-                                              const common::AsyncToken& token);
+                                                    const common::AsyncToken& token);
   common::TizenResult IotconRemoteResourceMethodPost(const picojson::object& args,
-                                               const common::AsyncToken& token);
+                                                     const common::AsyncToken& token);
   common::TizenResult IotconRemoteResourceMethodDelete(const picojson::object& args,
-                                                 const common::AsyncToken& token);
+                                                       const common::AsyncToken& token);
   common::TizenResult IotconRemoteResourceStartObserving(const picojson::object& args);
   common::TizenResult IotconRemoteResourceStopObserving(const picojson::object& args);
   common::TizenResult IotconRemoteResourceStartCaching(const picojson::object& args);
   common::TizenResult IotconRemoteResourceStopCaching(const picojson::object& args);
-  common::TizenResult IotconRemoteResourceSetResourceStateChangeListener(const picojson::object& args);
-  common::TizenResult IotconRemoteResourceUnsetResourceStateChangeListener(const picojson::object& args);
+  common::TizenResult IotconRemoteResourceSetResourceStateChangeListener(
+      const picojson::object& args);
+  common::TizenResult IotconRemoteResourceUnsetResourceStateChangeListener(
+      const picojson::object& args);
   common::TizenResult IotconRemoteResourceGetTimeInterval(const picojson::object& args);
   common::TizenResult IotconRemoteResourceSetTimeInterval(const picojson::object& args);
   common::TizenResult IotconClientFindResource(const picojson::object& args);
diff --git a/src/keymanager/keymanager_instance.cc b/src/keymanager/keymanager_instance.cc
index 90591e1..9bb567b 100644
--- a/src/keymanager/keymanager_instance.cc
+++ b/src/keymanager/keymanager_instance.cc
@@ -49,8 +49,7 @@ KeyManagerInstance::KeyManagerInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&KeyManagerInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&KeyManagerInstance::M, this, _1, _2))
 
   REGISTER_METHOD(KeyManagerGetDataAliasList);
   REGISTER_METHOD(KeyManagerSaveData);
@@ -61,7 +60,8 @@ KeyManagerInstance::KeyManagerInstance() {
 #undef REGISTER_METHOD
 }
 
-void KeyManagerInstance::KeyManagerGetDataAliasList(const picojson::value& args, picojson::object& out) {
+void KeyManagerInstance::KeyManagerGetDataAliasList(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
 
   picojson::value result = picojson::value(picojson::array());
@@ -258,7 +258,8 @@ void KeyManagerInstance::KeyManagerRemoveAlias(const picojson::value& args, pico
   }
 }
 
-void KeyManagerInstance::KeyManagerSetPermissions(const picojson::value& args, picojson::object& out) {
+void KeyManagerInstance::KeyManagerSetPermissions(const picojson::value& args,
+                                                  picojson::object& out) {
   ScopeLogger();
 
   const std::string& data_name = args.get("aliasName").get<std::string>();
diff --git a/src/mediacontroller/mediacontroller_instance.cc b/src/mediacontroller/mediacontroller_instance.cc
index 3aed68c..ed9cacd 100644
--- a/src/mediacontroller/mediacontroller_instance.cc
+++ b/src/mediacontroller/mediacontroller_instance.cc
@@ -45,7 +45,7 @@ MediaControllerInstance::MediaControllerInstance() {
   using namespace std::placeholders;
 
 #define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&MediaControllerInstance::M, this, _1, _2))
+  RegisterSyncHandler(#M, std::bind(&MediaControllerInstance::M, this, _1, _2))
 
   // server
   REGISTER_METHOD(MediaControllerManagerCreateServer);
diff --git a/src/mediakey/mediakey_instance.cc b/src/mediakey/mediakey_instance.cc
index 26543c2..6a12c7e 100644
--- a/src/mediakey/mediakey_instance.cc
+++ b/src/mediakey/mediakey_instance.cc
@@ -34,8 +34,7 @@ MediaKeyInstance::MediaKeyInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&MediaKeyInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&MediaKeyInstance::M, this, _1, _2))
   REGISTER_METHOD(SetMediaKeyEventListener);
   REGISTER_METHOD(UnsetMediaKeyEventListener);
 #undef REGISTER_METHOD
diff --git a/src/messageport/messageport_instance.cc b/src/messageport/messageport_instance.cc
index 84e61f9..7093478 100644
--- a/src/messageport/messageport_instance.cc
+++ b/src/messageport/messageport_instance.cc
@@ -41,8 +41,7 @@ MessageportInstance::MessageportInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&MessageportInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&MessageportInstance::M, this, _1, _2))
   REGISTER_METHOD(MessagePortManagerRequestTrustedRemoteMessagePort);
   REGISTER_METHOD(MessagePortManagerRequestLocalMessagePort);
   REGISTER_METHOD(MessagePortManagerRequestTrustedLocalMessagePort);
diff --git a/src/messaging/MsgCommon/AbstractFilter.cpp b/src/messaging/MsgCommon/AbstractFilter.cpp
index 123128e..3acdf31 100644
--- a/src/messaging/MsgCommon/AbstractFilter.cpp
+++ b/src/messaging/MsgCommon/AbstractFilter.cpp
@@ -195,16 +195,16 @@ bool FilterUtils::isTimeStampInRange(const time_t& time_stamp, tizen::AnyPtr& in
   ScopeLogger();
 
   if (!initial_value || !end_value) {
-    LoggerD("initial_value is %snull. end_value is %snull",
-            initial_value ? "NOT " : "", end_value ? "NOT " : "");
+    LoggerD("initial_value is %snull. end_value is %snull", initial_value ? "NOT " : "",
+            end_value ? "NOT " : "");
     return false;
   }
 
-  time_t from_time = initial_value->isNullOrUndefined() ?
-                      std::numeric_limits<time_t>::min() : initial_value->toTimeT();
+  time_t from_time = initial_value->isNullOrUndefined() ? std::numeric_limits<time_t>::min()
+                                                        : initial_value->toTimeT();
 
-  time_t to_time = end_value->isNullOrUndefined() ?
-                    std::numeric_limits<time_t>::max() : end_value->toTimeT();
+  time_t to_time =
+      end_value->isNullOrUndefined() ? std::numeric_limits<time_t>::max() : end_value->toTimeT();
 
   bool is_in_range = FilterUtils::isBetweenTimeRange(time_stamp, from_time, to_time);
 
diff --git a/src/messaging/MsgCommon/AbstractFilter.h b/src/messaging/MsgCommon/AbstractFilter.h
index 2d0bd37..feea786 100644
--- a/src/messaging/MsgCommon/AbstractFilter.h
+++ b/src/messaging/MsgCommon/AbstractFilter.h
@@ -17,10 +17,10 @@
 #ifndef __TIZEN_TIZEN_ABSTRACT_FILTER_H__
 #define __TIZEN_TIZEN_ABSTRACT_FILTER_H__
 
+#include <time.h>
 #include <memory>
 #include <sstream>
 #include <vector>
-#include <time.h>
 //#include <JSArray.h>
 
 #include "Any.h"
diff --git a/src/messaging/messaging_instance.cc b/src/messaging/messaging_instance.cc
index 98e9b71..0b15aa7 100644
--- a/src/messaging/messaging_instance.cc
+++ b/src/messaging/messaging_instance.cc
@@ -91,8 +91,7 @@ MessagingInstance::MessagingInstance() : manager_(*this), queue_(*this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&MessagingInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&MessagingInstance::M, this, _1, _2))
   REGISTER_METHOD(GetMessageServices);
   REGISTER_METHOD(MessageServiceSendMessage);
   REGISTER_METHOD(MessageServiceLoadMessageBody);
@@ -105,7 +104,6 @@ MessagingInstance::MessagingInstance() : manager_(*this), queue_(*this) {
   REGISTER_METHOD(MessageStorageRemoveConversations);
   REGISTER_METHOD(MessageStorageFindFolders);
 
-
   REGISTER_METHOD(MessageServiceSync);
   REGISTER_METHOD(MessageServiceStopSync);
   REGISTER_METHOD(MessageServiceSyncFolder);
@@ -399,7 +397,8 @@ void MessagingInstance::MessageServiceStopSync(const picojson::value& args, pico
   }
 }
 
-void MessagingInstance::MessageStorageAddDraftMessage(const picojson::value& args, picojson::object& out) {
+void MessagingInstance::MessageStorageAddDraftMessage(const picojson::value& args,
+                                                      picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingWrite, &out);
diff --git a/src/networkbearerselection/networkbearerselection_instance.cc b/src/networkbearerselection/networkbearerselection_instance.cc
index dcf517d..f4175fe 100644
--- a/src/networkbearerselection/networkbearerselection_instance.cc
+++ b/src/networkbearerselection/networkbearerselection_instance.cc
@@ -46,7 +46,7 @@ NetworkBearerSelectionInstance::NetworkBearerSelectionInstance() {
   using std::placeholders::_2;
 
 #define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&NetworkBearerSelectionInstance::M, this, _1, _2))
+  RegisterSyncHandler(#M, std::bind(&NetworkBearerSelectionInstance::M, this, _1, _2))
   REGISTER_METHOD(NetworkBearerSelectionRequestRouteToHost);
   REGISTER_METHOD(NetworkBearerSelectionReleaseRouteToHost);
 #undef REGISTER_METHOD
diff --git a/src/nfc/nfc_instance.cc b/src/nfc/nfc_instance.cc
index ed84dc5..7ba798e 100644
--- a/src/nfc/nfc_instance.cc
+++ b/src/nfc/nfc_instance.cc
@@ -76,8 +76,7 @@ NFCInstance::NFCInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&NFCInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&NFCInstance::M, this, _1, _2))
   REGISTER_METHOD(NFCManagerGetDefaultAdapter);
   REGISTER_METHOD(NFCManagerSetExclusiveMode);
   REGISTER_METHOD(NFCAdapterSetPowered);
@@ -211,7 +210,8 @@ void NFCInstance::NFCAdapterGetPowered(const picojson::value& args, picojson::ob
   ReportSuccess(picojson::value(ret), out);
 }
 
-void NFCInstance::NFCAdapterCardEmulationModeSetter(const picojson::value& args, picojson::object& out) {
+void NFCInstance::NFCAdapterCardEmulationModeSetter(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -225,7 +225,8 @@ void NFCInstance::NFCAdapterCardEmulationModeSetter(const picojson::value& args,
   }
 }
 
-void NFCInstance::NFCAdapterCardEmulationModeGetter(const picojson::value& args, picojson::object& out) {
+void NFCInstance::NFCAdapterCardEmulationModeGetter(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -238,7 +239,8 @@ void NFCInstance::NFCAdapterCardEmulationModeGetter(const picojson::value& args,
   }
 }
 
-void NFCInstance::NFCAdapterActiveSecureElementSetter(const picojson::value& args, picojson::object& out) {
+void NFCInstance::NFCAdapterActiveSecureElementSetter(const picojson::value& args,
+                                                      picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -252,7 +254,8 @@ void NFCInstance::NFCAdapterActiveSecureElementSetter(const picojson::value& arg
   }
 }
 
-void NFCInstance::NFCAdapterActiveSecureElementGetter(const picojson::value& args, picojson::object& out) {
+void NFCInstance::NFCAdapterActiveSecureElementGetter(const picojson::value& args,
+                                                      picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -285,7 +288,8 @@ void NFCInstance::NFCAdapterSetTagListener(const picojson::value& args, picojson
   }
 }
 
-void NFCInstance::NFCAdapterPeerIsConnectedGetter(const picojson::value& args, picojson::object& out) {
+void NFCInstance::NFCAdapterPeerIsConnectedGetter(const picojson::value& args,
+                                                  picojson::object& out) {
   ScopeLogger();
   CHECK_EXIST(args, "id", out);
 
@@ -357,7 +361,7 @@ void NFCInstance::NFCAdapterUnsetPeerListener(const picojson::value& args, picoj
 }
 
 void NFCInstance::NFCAdapterAddCardEmulationModeChangeListener(const picojson::value& args,
-                                                     picojson::object& out) {
+                                                               picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -370,7 +374,7 @@ void NFCInstance::NFCAdapterAddCardEmulationModeChangeListener(const picojson::v
 }
 
 void NFCInstance::NFCAdapterRemoveCardEmulationModeChangeListener(const picojson::value& args,
-                                                        picojson::object& out) {
+                                                                  picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -382,7 +386,8 @@ void NFCInstance::NFCAdapterRemoveCardEmulationModeChangeListener(const picojson
   }
 }
 
-void NFCInstance::NFCAdapterAddTransactionEventListener(const picojson::value& args, picojson::object& out) {
+void NFCInstance::NFCAdapterAddTransactionEventListener(const picojson::value& args,
+                                                        picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -395,7 +400,7 @@ void NFCInstance::NFCAdapterAddTransactionEventListener(const picojson::value& a
 }
 
 void NFCInstance::NFCAdapterRemoveTransactionEventListener(const picojson::value& args,
-                                                 picojson::object& out) {
+                                                           picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -408,7 +413,7 @@ void NFCInstance::NFCAdapterRemoveTransactionEventListener(const picojson::value
 }
 
 void NFCInstance::NFCAdapterAddActiveSecureElementChangeListener(const picojson::value& args,
-                                                       picojson::object& out) {
+                                                                 picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -421,7 +426,7 @@ void NFCInstance::NFCAdapterAddActiveSecureElementChangeListener(const picojson:
 }
 
 void NFCInstance::NFCAdapterRemoveActiveSecureElementChangeListener(const picojson::value& args,
-                                                          picojson::object& out) {
+                                                                    picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -449,7 +454,7 @@ void NFCInstance::NFCAdapterGetCachedMessage(const picojson::value& args, picojs
 }
 
 void NFCInstance::NFCAdapterSetExclusiveModeForTransaction(const picojson::value& args,
-                                                 picojson::object& out) {
+                                                           picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -518,7 +523,8 @@ void NFCInstance::NFCTagTransceive(const picojson::value& args, picojson::object
   }
 }
 
-void NFCInstance::NFCPeerSetReceiveNDEFListener(const picojson::value& args, picojson::object& out) {
+void NFCInstance::NFCPeerSetReceiveNDEFListener(const picojson::value& args,
+                                                picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcP2P, &out);
 
@@ -533,7 +539,8 @@ void NFCInstance::NFCPeerSetReceiveNDEFListener(const picojson::value& args, pic
   }
 }
 
-void NFCInstance::NFCPeerUnsetReceiveNDEFListener(const picojson::value& args, picojson::object& out) {
+void NFCInstance::NFCPeerUnsetReceiveNDEFListener(const picojson::value& args,
+                                                  picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcP2P, &out);
 
@@ -815,7 +822,8 @@ void NFCInstance::NFCTagIsConnectedGetter(const picojson::value& args, picojson:
   }
 }
 
-void NFCInstance::NFCAdapterAddHCEEventListener(const picojson::value& args, picojson::object& out) {
+void NFCInstance::NFCAdapterAddHCEEventListener(const picojson::value& args,
+                                                picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -827,7 +835,8 @@ void NFCInstance::NFCAdapterAddHCEEventListener(const picojson::value& args, pic
   }
 }
 
-void NFCInstance::NFCAdapterRemoveHCEEventListener(const picojson::value& args, picojson::object& out) {
+void NFCInstance::NFCAdapterRemoveHCEEventListener(const picojson::value& args,
+                                                   picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -839,7 +848,8 @@ void NFCInstance::NFCAdapterRemoveHCEEventListener(const picojson::value& args,
   }
 }
 
-void NFCInstance::NFCAdapterSendHostAPDUResponse(const picojson::value& args, picojson::object& out) {
+void NFCInstance::NFCAdapterSendHostAPDUResponse(const picojson::value& args,
+                                                 picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -871,7 +881,8 @@ void NFCInstance::NFCAdapterSendHostAPDUResponse(const picojson::value& args, pi
       &NFCAdapter::SendHostAPDUResponse, NFCAdapter::GetInstance(), apdu, success_cb, error_cb));
 }
 
-void NFCInstance::NFCAdapterIsActivatedHandlerForAID(const picojson::value& args, picojson::object& out) {
+void NFCInstance::NFCAdapterIsActivatedHandlerForAID(const picojson::value& args,
+                                                     picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
@@ -891,7 +902,7 @@ void NFCInstance::NFCAdapterIsActivatedHandlerForAID(const picojson::value& args
 }
 
 void NFCInstance::NFCAdapterIsActivatedHandlerForCategory(const picojson::value& args,
-                                                picojson::object& out) {
+                                                          picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out);
 
diff --git a/src/nfc/nfc_instance.h b/src/nfc/nfc_instance.h
index 99d5746..ffea8a3 100644
--- a/src/nfc/nfc_instance.h
+++ b/src/nfc/nfc_instance.h
@@ -44,12 +44,16 @@ class NFCInstance : public common::ParsedInstance, NFCAdapter::IResponder {
   void NFCAdapterSetPeerListener(const picojson::value& args, picojson::object& out);
   void NFCAdapterUnsetTagListener(const picojson::value& args, picojson::object& out);
   void NFCAdapterUnsetPeerListener(const picojson::value& args, picojson::object& out);
-  void NFCAdapterAddCardEmulationModeChangeListener(const picojson::value& args, picojson::object& out);
-  void NFCAdapterRemoveCardEmulationModeChangeListener(const picojson::value& args, picojson::object& out);
+  void NFCAdapterAddCardEmulationModeChangeListener(const picojson::value& args,
+                                                    picojson::object& out);
+  void NFCAdapterRemoveCardEmulationModeChangeListener(const picojson::value& args,
+                                                       picojson::object& out);
   void NFCAdapterAddTransactionEventListener(const picojson::value& args, picojson::object& out);
   void NFCAdapterRemoveTransactionEventListener(const picojson::value& args, picojson::object& out);
-  void NFCAdapterAddActiveSecureElementChangeListener(const picojson::value& args, picojson::object& out);
-  void NFCAdapterRemoveActiveSecureElementChangeListener(const picojson::value& args, picojson::object& out);
+  void NFCAdapterAddActiveSecureElementChangeListener(const picojson::value& args,
+                                                      picojson::object& out);
+  void NFCAdapterRemoveActiveSecureElementChangeListener(const picojson::value& args,
+                                                         picojson::object& out);
   void NFCAdapterGetCachedMessage(const picojson::value& args, picojson::object& out);
   void NFCAdapterSetExclusiveModeForTransaction(const picojson::value& args, picojson::object& out);
   void NFCTagReadNDEF(const picojson::value& args, picojson::object& out);
diff --git a/src/notification/notification_instance.cc b/src/notification/notification_instance.cc
index c57755d..7d2a079 100644
--- a/src/notification/notification_instance.cc
+++ b/src/notification/notification_instance.cc
@@ -40,7 +40,7 @@ NotificationInstance::NotificationInstance() {
   using std::placeholders::_2;
 
 #define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&NotificationInstance::M, this, _1, _2))
+  RegisterSyncHandler(#M, std::bind(&NotificationInstance::M, this, _1, _2))
   REGISTER_METHOD(NotificationManagerGet);
   REGISTER_METHOD(NotificationManagerUpdate);
   REGISTER_METHOD(NotificationManagerRemove);
@@ -214,8 +214,8 @@ void NotificationInstance::NotificationManagerStopLEDCustomEffect(const picojson
   }
 }
 
-void NotificationInstance::NotificationManagerSaveNotificationAsTemplate(const picojson::value& args,
-                                                           picojson::object& out) {
+void NotificationInstance::NotificationManagerSaveNotificationAsTemplate(
+    const picojson::value& args, picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out);
 
@@ -228,8 +228,8 @@ void NotificationInstance::NotificationManagerSaveNotificationAsTemplate(const p
   }
 }
 
-void NotificationInstance::NotificationManagerCreateNotificationFromTemplate(const picojson::value& args,
-                                                                 picojson::object& out) {
+void NotificationInstance::NotificationManagerCreateNotificationFromTemplate(
+    const picojson::value& args, picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out);
   picojson::value val{picojson::object{}};
diff --git a/src/notification/notification_instance.h b/src/notification/notification_instance.h
index 9374ae2..0d73090 100644
--- a/src/notification/notification_instance.h
+++ b/src/notification/notification_instance.h
@@ -40,8 +40,10 @@ class NotificationInstance : public common::ParsedInstance {
 
   void NotificationManagerPlayLEDCustomEffect(const picojson::value& args, picojson::object& out);
   void NotificationManagerStopLEDCustomEffect(const picojson::value& args, picojson::object& out);
-  void NotificationManagerSaveNotificationAsTemplate(const picojson::value& args, picojson::object& out);
-  void NotificationManagerCreateNotificationFromTemplate(const picojson::value& args, picojson::object& out);
+  void NotificationManagerSaveNotificationAsTemplate(const picojson::value& args,
+                                                     picojson::object& out);
+  void NotificationManagerCreateNotificationFromTemplate(const picojson::value& args,
+                                                         picojson::object& out);
 };
 
 }  // namespace notification
diff --git a/src/package/package_instance.cc b/src/package/package_instance.cc
index 3c09122..c1779c6 100644
--- a/src/package/package_instance.cc
+++ b/src/package/package_instance.cc
@@ -245,8 +245,7 @@ PackageInstance::PackageInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&PackageInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&PackageInstance::M, this, _1, _2))
   REGISTER_METHOD(PackageManagerSetPackageInfoEventListener);
   REGISTER_METHOD(PackageManagerInstall);
   REGISTER_METHOD(PackageManagerGetPackagesInfo);
diff --git a/src/playerutil/playerutil_instance.cc b/src/playerutil/playerutil_instance.cc
index d66f1dc..955df6a 100644
--- a/src/playerutil/playerutil_instance.cc
+++ b/src/playerutil/playerutil_instance.cc
@@ -34,10 +34,7 @@ PlayerUtilInstance::PlayerUtilInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-
-
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&PlayerUtilInstance::M, this, _1))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&PlayerUtilInstance::M, this, _1))
   REGISTER_METHOD(PlayerUtilGetLatencyMode);
   REGISTER_METHOD(PlayerUtilSetLatencyMode);
 #undef REGISTER_METHOD
diff --git a/src/power/power_instance.cc b/src/power/power_instance.cc
index c4988b3..7187446 100644
--- a/src/power/power_instance.cc
+++ b/src/power/power_instance.cc
@@ -54,8 +54,7 @@ PowerInstance::PowerInstance() : manager_(*this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&PowerInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&PowerInstance::M, this, _1, _2))
   REGISTER_METHOD(PowerManagerRequest);
   REGISTER_METHOD(PowerManagerRelease);
   REGISTER_METHOD(PowerManagerSetScreenStateChangeListener);
@@ -107,7 +106,7 @@ void PowerInstance::PowerManagerRelease(const picojson::value& args, picojson::o
 }
 
 void PowerInstance::PowerManagerSetScreenStateChangeListener(const picojson::value& args,
-                                                 picojson::object& out) {
+                                                             picojson::object& out) {
   ScopeLogger();
   PlatformResult result = manager_.SetScreenStateChangeListener();
   if (result.IsError()) {
@@ -118,7 +117,7 @@ void PowerInstance::PowerManagerSetScreenStateChangeListener(const picojson::val
 }
 
 void PowerInstance::PowerManagerUnsetScreenStateChangeListener(const picojson::value& args,
-                                                   picojson::object& out) {
+                                                               picojson::object& out) {
   ScopeLogger();
   PlatformResult result = manager_.UnsetScreenStateChangeListener();
   if (result.IsError()) {
@@ -128,7 +127,8 @@ void PowerInstance::PowerManagerUnsetScreenStateChangeListener(const picojson::v
   }
 }
 
-void PowerInstance::PowerManagerGetScreenBrightness(const picojson::value& args, picojson::object& out) {
+void PowerInstance::PowerManagerGetScreenBrightness(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
   double brightness;
   PlatformResult result = manager_.GetScreenBrightness(&brightness);
@@ -139,7 +139,8 @@ void PowerInstance::PowerManagerGetScreenBrightness(const picojson::value& args,
   }
 }
 
-void PowerInstance::PowerManagerSetScreenBrightness(const picojson::value& args, picojson::object& out) {
+void PowerInstance::PowerManagerSetScreenBrightness(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegePower, &out);
 
@@ -165,7 +166,8 @@ void PowerInstance::PowerManagerIsScreenOn(const picojson::value& args, picojson
   }
 }
 
-void PowerInstance::PowerManagerRestoreScreenBrightness(const picojson::value& args, picojson::object& out) {
+void PowerInstance::PowerManagerRestoreScreenBrightness(const picojson::value& args,
+                                                        picojson::object& out) {
   ScopeLogger();
   PlatformResult result = manager_.RestoreScreenBrightness();
   if (result.IsError()) {
diff --git a/src/power/power_instance.h b/src/power/power_instance.h
index db07da4..26465f2 100644
--- a/src/power/power_instance.h
+++ b/src/power/power_instance.h
@@ -33,7 +33,8 @@ class PowerInstance : public common::ParsedInstance {
   void PowerManagerRequest(const picojson::value& args, picojson::object& out);
   void PowerManagerRelease(const picojson::value& args, picojson::object& out);
   void PowerManagerSetScreenStateChangeListener(const picojson::value& args, picojson::object& out);
-  void PowerManagerUnsetScreenStateChangeListener(const picojson::value& args, picojson::object& out);
+  void PowerManagerUnsetScreenStateChangeListener(const picojson::value& args,
+                                                  picojson::object& out);
   void PowerManagerGetScreenBrightness(const picojson::value& args, picojson::object& out);
   void PowerManagerSetScreenBrightness(const picojson::value& args, picojson::object& out);
   void PowerManagerIsScreenOn(const picojson::value& args, picojson::object& out);
diff --git a/src/ppm/ppm_instance.cc b/src/ppm/ppm_instance.cc
index 41478f0..3796c2b 100644
--- a/src/ppm/ppm_instance.cc
+++ b/src/ppm/ppm_instance.cc
@@ -43,16 +43,12 @@ PPMInstance::PPMInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-
-
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&PPMInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&PPMInstance::M, this, _1, _2))
   REGISTER_METHOD(PPMManagerCheckPermission);
   REGISTER_METHOD(PPMManagerCheckPermissions);
   REGISTER_METHOD(PPMManagerRequestPermission);
   REGISTER_METHOD(PPMManagerRequestPermissions);
 #undef REGISTER_METHOD
-
 }
 
 PPMInstance::~PPMInstance() {
diff --git a/src/preference/preference_instance.cc b/src/preference/preference_instance.cc
index 13ab66d..d521c64 100644
--- a/src/preference/preference_instance.cc
+++ b/src/preference/preference_instance.cc
@@ -42,8 +42,7 @@ PreferenceInstance::PreferenceInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&PreferenceInstance::M, this, _1))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&PreferenceInstance::M, this, _1))
   REGISTER_METHOD(PreferenceManagerSetValue);
   REGISTER_METHOD(PreferenceManagerGetValue);
   REGISTER_METHOD(PreferenceManagerRemove);
@@ -53,8 +52,7 @@ PreferenceInstance::PreferenceInstance() {
   REGISTER_METHOD(PreferenceManagerUnsetChangeListener);
 #undef REGISTER_METHOD
 
-#define REGISTER_METHOD(M) \
-    RegisterHandler(#M, std::bind(&PreferenceInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterHandler(#M, std::bind(&PreferenceInstance::M, this, _1, _2))
   REGISTER_METHOD(PreferenceManagerGetAll);
 #undef REGISTER_METHOD
 }
@@ -64,7 +62,7 @@ PreferenceInstance::~PreferenceInstance() {
 }
 
 common::TizenResult PreferenceInstance::PreferenceManagerGetAll(const picojson::object& args,
-                                               const common::AsyncToken& token) {
+                                                                const common::AsyncToken& token) {
   ScopeLogger();
 
   return manager_.GetAll(SimplePost(token));
@@ -111,7 +109,8 @@ common::TizenResult PreferenceInstance::PreferenceManagerExists(const picojson::
   return manager_.Exists(key);
 }
 
-common::TizenResult PreferenceInstance::PreferenceManagerSetChangeListener(const picojson::object& args) {
+common::TizenResult PreferenceInstance::PreferenceManagerSetChangeListener(
+    const picojson::object& args) {
   ScopeLogger();
   CHECK_EXIST(args, kKey)
   const auto& key = args.find(kKey)->second.get<std::string>();
@@ -124,7 +123,8 @@ common::TizenResult PreferenceInstance::PreferenceManagerSetChangeListener(const
   return manager_.SetChangeListener(key, callback);
 }
 
-common::TizenResult PreferenceInstance::PreferenceManagerUnsetChangeListener(const picojson::object& args) {
+common::TizenResult PreferenceInstance::PreferenceManagerUnsetChangeListener(
+    const picojson::object& args) {
   ScopeLogger();
 
   CHECK_EXIST(args, kKey)
diff --git a/src/preference/preference_instance.h b/src/preference/preference_instance.h
index dfc5dde..6f51f25 100644
--- a/src/preference/preference_instance.h
+++ b/src/preference/preference_instance.h
@@ -29,7 +29,8 @@ class PreferenceInstance : public common::TizenInstance {
   virtual ~PreferenceInstance();
 
  private:
-  common::TizenResult PreferenceManagerGetAll(const picojson::object& args, const common::AsyncToken& token);
+  common::TizenResult PreferenceManagerGetAll(const picojson::object& args,
+                                              const common::AsyncToken& token);
   common::TizenResult PreferenceManagerSetValue(const picojson::object& args);
   common::TizenResult PreferenceManagerGetValue(const picojson::object& args);
   common::TizenResult PreferenceManagerRemove(const picojson::object& args);
diff --git a/src/push/push_instance.cc b/src/push/push_instance.cc
index 06d728a..89c795c 100644
--- a/src/push/push_instance.cc
+++ b/src/push/push_instance.cc
@@ -35,8 +35,7 @@ PushInstance::PushInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&PushInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&PushInstance::M, this, _1, _2))
   REGISTER_METHOD(PushRegisterService);
   REGISTER_METHOD(PushRegisterApplication);
   REGISTER_METHOD(PushUnregisterService);
diff --git a/src/radio/radio_instance.cc b/src/radio/radio_instance.cc
index 6dab47e..4b0fe5f 100644
--- a/src/radio/radio_instance.cc
+++ b/src/radio/radio_instance.cc
@@ -15,8 +15,8 @@
  */
 
 #include "radio/radio_instance.h"
-#include <functional>
 #include <radio.h>
+#include <functional>
 #include "common/logger.h"
 
 namespace extension {
@@ -30,8 +30,7 @@ RadioInstance::RadioInstance() : manager_(*this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&RadioInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&RadioInstance::M, this, _1, _2))
   REGISTER_METHOD(FMRadioStart);
   REGISTER_METHOD(FMRadioStop);
   REGISTER_METHOD(SetFMRadioInterruptedListener);
@@ -67,7 +66,8 @@ void RadioInstance::FMRadioMuteSetter(const picojson::value& args, picojson::obj
   ReportSuccess(out);
 }
 
-void RadioInstance::FMRadioIsAntennaConnectedGetter(const picojson::value& args, picojson::object& out) {
+void RadioInstance::FMRadioIsAntennaConnectedGetter(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
   ReportSuccess(picojson::value(manager_.HasAntenna()), out);
 }
@@ -82,7 +82,8 @@ void RadioInstance::FMRadioFrequencyGetter(const picojson::value& args, picojson
   ReportSuccess(picojson::value(manager_.GetFrequency()), out);
 }
 
-void RadioInstance::FMRadioSignalStrengthGetter(const picojson::value& args, picojson::object& out) {
+void RadioInstance::FMRadioSignalStrengthGetter(const picojson::value& args,
+                                                picojson::object& out) {
   ScopeLogger();
   ReportSuccess(picojson::value(manager_.GetSignalStrength()), out);
 }
@@ -161,7 +162,8 @@ void RadioInstance::UnsetFMRadioInterruptedListener(const picojson::value& args,
   }
 }
 
-void RadioInstance::FMRadioSetAntennaChangeListener(const picojson::value& args, picojson::object& out) {
+void RadioInstance::FMRadioSetAntennaChangeListener(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
 
   PlatformResult result = manager_.SetAntennaChangeListener();
@@ -173,7 +175,8 @@ void RadioInstance::FMRadioSetAntennaChangeListener(const picojson::value& args,
   }
 }
 
-void RadioInstance::FMRadioUnsetAntennaChangeListener(const picojson::value& args, picojson::object& out) {
+void RadioInstance::FMRadioUnsetAntennaChangeListener(const picojson::value& args,
+                                                      picojson::object& out) {
   ScopeLogger();
 
   PlatformResult result = manager_.UnsetAntennaChangeListener();
diff --git a/src/secureelement/secureelement_instance.cc b/src/secureelement/secureelement_instance.cc
index 4b5821f..7be4d3d 100644
--- a/src/secureelement/secureelement_instance.cc
+++ b/src/secureelement/secureelement_instance.cc
@@ -110,8 +110,7 @@ SecureElementInstance::SecureElementInstance() : is_initialized_(false), is_list
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&SecureElementInstance::M, this, _1))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&SecureElementInstance::M, this, _1))
   REGISTER_METHOD(SEServiceRegisterSEListener);
   REGISTER_METHOD(SEServiceUnregisterSEListener);
   REGISTER_METHOD(SEServiceShutdown);
@@ -126,8 +125,7 @@ SecureElementInstance::SecureElementInstance() : is_initialized_(false), is_list
   REGISTER_METHOD(SEChannelGetSelectResponse);
 #undef REGISTER_METHOD
 
-#define REGISTER_METHOD(M) \
-    RegisterHandler(#M, std::bind(&SecureElementInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterHandler(#M, std::bind(&SecureElementInstance::M, this, _1, _2))
   REGISTER_METHOD(SEServiceGetReaders);
   REGISTER_METHOD(SEReaderOpenSession);
   REGISTER_METHOD(SESessionOpenBasicChannel);
@@ -149,7 +147,7 @@ SecureElementInstance::~SecureElementInstance() {
 
 // Service methods
 TizenResult SecureElementInstance::SEServiceGetReaders(picojson::object const& args,
-                                              const common::AsyncToken& token) {
+                                                       const common::AsyncToken& token) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeSecureElement);
@@ -293,7 +291,7 @@ TizenResult SecureElementInstance::SEReaderIsPresent(picojson::object const& arg
 }
 
 TizenResult SecureElementInstance::SEReaderOpenSession(picojson::object const& args,
-                                               const common::AsyncToken& token) {
+                                                       const common::AsyncToken& token) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeSecureElement);
@@ -358,7 +356,7 @@ TizenResult SecureElementInstance::IsBasicChannel(int channel, picojson::value&
 }
 
 TizenResult SecureElementInstance::SESessionOpenBasicChannel(picojson::object const& args,
-                                                    const common::AsyncToken& token) {
+                                                             const common::AsyncToken& token) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeSecureElement);
@@ -403,7 +401,7 @@ TizenResult SecureElementInstance::SESessionOpenBasicChannel(picojson::object co
 }
 
 TizenResult SecureElementInstance::SESessionOpenLogicalChannel(picojson::object const& args,
-                                                      const common::AsyncToken& token) {
+                                                               const common::AsyncToken& token) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeSecureElement);
@@ -536,7 +534,7 @@ TizenResult SecureElementInstance::SEChannelClose(picojson::object const& args)
 }
 
 TizenResult SecureElementInstance::SEChannelTransmit(picojson::object const& args,
-                                            const common::AsyncToken& token) {
+                                                     const common::AsyncToken& token) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeSecureElement);
diff --git a/src/secureelement/secureelement_instance.h b/src/secureelement/secureelement_instance.h
index 631858d..c2bbef4 100644
--- a/src/secureelement/secureelement_instance.h
+++ b/src/secureelement/secureelement_instance.h
@@ -29,7 +29,8 @@ class SecureElementInstance : public common::TizenInstance {
 
  private:
   /* Service methods */
-  common::TizenResult SEServiceGetReaders(picojson::object const& args, const common::AsyncToken& token);
+  common::TizenResult SEServiceGetReaders(picojson::object const& args,
+                                          const common::AsyncToken& token);
   common::TizenResult SEServiceRegisterSEListener(picojson::object const& args);
   common::TizenResult SEServiceUnregisterSEListener(picojson::object const& args);
   common::TizenResult SEServiceShutdown(picojson::object const& args);
@@ -37,15 +38,16 @@ class SecureElementInstance : public common::TizenInstance {
   /* Reader methods */
   common::TizenResult SEReaderGetName(picojson::object const& args);
   common::TizenResult SEReaderIsPresent(picojson::object const& args);
-  common::TizenResult SEReaderOpenSession(picojson::object const& args, const common::AsyncToken& token);
+  common::TizenResult SEReaderOpenSession(picojson::object const& args,
+                                          const common::AsyncToken& token);
   common::TizenResult SEReaderCloseSessions(picojson::object const& args);
 
   /* Session methods */
   common::TizenResult IsBasicChannel(int channel, picojson::value& val);
   common::TizenResult SESessionOpenBasicChannel(picojson::object const& args,
-                                       const common::AsyncToken& token);
+                                                const common::AsyncToken& token);
   common::TizenResult SESessionOpenLogicalChannel(picojson::object const& args,
-                                         const common::AsyncToken& token);
+                                                  const common::AsyncToken& token);
   common::TizenResult SESessionGetATR(picojson::object const& args);
   common::TizenResult SESessionIsClosed(picojson::object const& args);
   common::TizenResult SESessionClose(picojson::object const& args);
@@ -53,7 +55,8 @@ class SecureElementInstance : public common::TizenInstance {
 
   /* Channel methods */
   common::TizenResult SEChannelClose(picojson::object const& args);
-  common::TizenResult SEChannelTransmit(picojson::object const& args, const common::AsyncToken& token);
+  common::TizenResult SEChannelTransmit(picojson::object const& args,
+                                        const common::AsyncToken& token);
   common::TizenResult SEChannelGetSelectResponse(picojson::object const& args);
 
   common::TizenResult Deinitialize();
diff --git a/src/sensor/sensor_instance.cc b/src/sensor/sensor_instance.cc
index 102a955..2334728 100644
--- a/src/sensor/sensor_instance.cc
+++ b/src/sensor/sensor_instance.cc
@@ -30,8 +30,7 @@ SensorInstance::SensorInstance() : service_(*this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&SensorInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&SensorInstance::M, this, _1, _2))
   REGISTER_METHOD(SensorServiceGetAvailableSensors);
   REGISTER_METHOD(SensorStop);
   REGISTER_METHOD(SensorSetChangeListener);
@@ -46,7 +45,8 @@ SensorInstance::~SensorInstance() {
   ScopeLogger();
 }
 
-void SensorInstance::SensorServiceGetAvailableSensors(const picojson::value& args, picojson::object& out) {
+void SensorInstance::SensorServiceGetAvailableSensors(const picojson::value& args,
+                                                      picojson::object& out) {
   ScopeLogger();
   service_.GetAvailableSensors(out);
 }
@@ -77,7 +77,8 @@ void SensorInstance::SensorGetData(const picojson::value& args, picojson::object
   service_.GetSensorData(args, out);
 }
 
-void SensorInstance::SensorGetSensorHardwareInfo(const picojson::value& args, picojson::object& out) {
+void SensorInstance::SensorGetSensorHardwareInfo(const picojson::value& args,
+                                                 picojson::object& out) {
   ScopeLogger();
 
   service_.GetSensorHardwareInfo(args, out);
diff --git a/src/sound/sound_instance.cc b/src/sound/sound_instance.cc
index fae0361..7d493b9 100644
--- a/src/sound/sound_instance.cc
+++ b/src/sound/sound_instance.cc
@@ -41,9 +41,7 @@ SoundInstance::SoundInstance() : manager_(*this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&SoundInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&SoundInstance::M, this, _1, _2))
   REGISTER_METHOD(SoundManagerSetVolume);
   REGISTER_METHOD(SoundManagerUnsetSoundModeChangeListener);
   REGISTER_METHOD(SoundManagerGetVolume);
diff --git a/src/systeminfo/systeminfo_instance.cc b/src/systeminfo/systeminfo_instance.cc
index 8ebbe67..a8b5845 100644
--- a/src/systeminfo/systeminfo_instance.cc
+++ b/src/systeminfo/systeminfo_instance.cc
@@ -54,8 +54,7 @@ SysteminfoInstance::SysteminfoInstance() : manager_(this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&SysteminfoInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&SysteminfoInstance::M, this, _1, _2))
   REGISTER_METHOD(SystemInfoGetCapabilities);
   REGISTER_METHOD(SystemInfoGetCapability);
   REGISTER_METHOD(SystemInfoAddPropertyValueChangeListener);
@@ -75,7 +74,8 @@ SysteminfoInstance::~SysteminfoInstance() {
   ScopeLogger();
 }
 
-void SysteminfoInstance::SystemInfoGetCapabilities(const picojson::value& args, picojson::object& out) {
+void SysteminfoInstance::SystemInfoGetCapabilities(const picojson::value& args,
+                                                   picojson::object& out) {
   ScopeLogger();
   LoggerW(
       "DEPRECATION WARNING: getCapabilities() is deprecated and will be removed from next release. "
@@ -84,39 +84,44 @@ void SysteminfoInstance::SystemInfoGetCapabilities(const picojson::value& args,
   manager_.GetCapabilities(args, &out);
 }
 
-void SysteminfoInstance::SystemInfoGetCapability(const picojson::value& args, picojson::object& out) {
+void SysteminfoInstance::SystemInfoGetCapability(const picojson::value& args,
+                                                 picojson::object& out) {
   ScopeLogger();
   manager_.GetCapability(args, &out);
 }
 
-void SysteminfoInstance::SystemInfoGetPropertyValue(const picojson::value& args, picojson::object& out) {
+void SysteminfoInstance::SystemInfoGetPropertyValue(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
   manager_.GetPropertyValue(args, &out);
 }
 
-void SysteminfoInstance::SystemInfoGetPropertyValueArray(const picojson::value& args, picojson::object& out) {
+void SysteminfoInstance::SystemInfoGetPropertyValueArray(const picojson::value& args,
+                                                         picojson::object& out) {
   ScopeLogger();
   manager_.GetPropertyValueArray(args, &out);
 }
 
 void SysteminfoInstance::SystemInfoAddPropertyValueChangeListener(const picojson::value& args,
-                                                        picojson::object& out) {
+                                                                  picojson::object& out) {
   ScopeLogger();
   manager_.AddPropertyValueChangeListener(args, &out);
 }
 
 void SysteminfoInstance::SystemInfoRemovePropertyValueChangeListener(const picojson::value& args,
-                                                           picojson::object& out) {
+                                                                     picojson::object& out) {
   ScopeLogger();
   manager_.RemovePropertyValueChangeListener(args, &out);
 }
 
-void SysteminfoInstance::SystemInfoGetTotalMemory(const picojson::value& args, picojson::object& out) {
+void SysteminfoInstance::SystemInfoGetTotalMemory(const picojson::value& args,
+                                                  picojson::object& out) {
   ScopeLogger();
   manager_.GetTotalMemory(args, &out);
 }
 
-void SysteminfoInstance::SystemInfoGetAvailableMemory(const picojson::value& args, picojson::object& out) {
+void SysteminfoInstance::SystemInfoGetAvailableMemory(const picojson::value& args,
+                                                      picojson::object& out) {
   ScopeLogger();
   manager_.GetAvailableMemory(args, &out);
 }
@@ -126,7 +131,8 @@ void SysteminfoInstance::SystemInfoGetCount(const picojson::value& args, picojso
   manager_.GetCount(args, &out);
 }
 
-void SysteminfoInstance::SystemInfoSetBrightness(const picojson::value& args, picojson::object& out) {
+void SysteminfoInstance::SystemInfoSetBrightness(const picojson::value& args,
+                                                 picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeLED, &out);
 
@@ -150,7 +156,8 @@ void SysteminfoInstance::SystemInfoSetBrightness(const picojson::value& args, pi
   ReportSuccess(out);
 }
 
-void SysteminfoInstance::SystemInfoGetBrightness(const picojson::value& args, picojson::object& out) {
+void SysteminfoInstance::SystemInfoGetBrightness(const picojson::value& args,
+                                                 picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeLED, &out);
 
@@ -166,7 +173,8 @@ void SysteminfoInstance::SystemInfoGetBrightness(const picojson::value& args, pi
   ReportSuccess(picojson::value(std::to_string(brightness)), out);
 }
 
-void SysteminfoInstance::SystemInfoGetMaxBrightness(const picojson::value& args, picojson::object& out) {
+void SysteminfoInstance::SystemInfoGetMaxBrightness(const picojson::value& args,
+                                                    picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeLED, &out);
 
diff --git a/src/systeminfo/systeminfo_instance.h b/src/systeminfo/systeminfo_instance.h
index 4025fd0..2ce40c6 100644
--- a/src/systeminfo/systeminfo_instance.h
+++ b/src/systeminfo/systeminfo_instance.h
@@ -34,7 +34,8 @@ class SysteminfoInstance : public common::ParsedInstance {
   void SystemInfoGetPropertyValue(const picojson::value& args, picojson::object& out);
   void SystemInfoGetPropertyValueArray(const picojson::value& args, picojson::object& out);
   void SystemInfoAddPropertyValueChangeListener(const picojson::value& args, picojson::object& out);
-  void SystemInfoRemovePropertyValueChangeListener(const picojson::value& args, picojson::object& out);
+  void SystemInfoRemovePropertyValueChangeListener(const picojson::value& args,
+                                                   picojson::object& out);
   void SystemInfoGetMaxBrightness(const picojson::value& args, picojson::object& out);
   void SystemInfoGetBrightness(const picojson::value& args, picojson::object& out);
   void SystemInfoSetBrightness(const picojson::value& args, picojson::object& out);
diff --git a/src/systemsetting/systemsetting_instance.cc b/src/systemsetting/systemsetting_instance.cc
index 34267dc..a5de67c 100644
--- a/src/systemsetting/systemsetting_instance.cc
+++ b/src/systemsetting/systemsetting_instance.cc
@@ -48,7 +48,7 @@ SystemSettingInstance::SystemSettingInstance() {
   using std::placeholders::_2;
 
 #define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&SystemSettingInstance::M, this, _1, _2))
+  RegisterSyncHandler(#M, std::bind(&SystemSettingInstance::M, this, _1, _2))
   REGISTER_METHOD(SystemSettingManagerGetProperty);
   REGISTER_METHOD(SystemSettingManagerSetProperty);
 #undef REGISTER_METHOD
@@ -58,7 +58,8 @@ SystemSettingInstance::~SystemSettingInstance() {
   ScopeLogger();
 }
 
-void SystemSettingInstance::SystemSettingManagerGetProperty(const picojson::value& args, picojson::object& out) {
+void SystemSettingInstance::SystemSettingManagerGetProperty(const picojson::value& args,
+                                                            picojson::object& out) {
   ScopeLogger();
   const double callback_id = args.get("callbackId").get<double>();
 
@@ -128,7 +129,8 @@ PlatformResult SystemSettingInstance::getPlatformPropertyValue(const std::string
   }
 }
 
-void SystemSettingInstance::SystemSettingManagerSetProperty(const picojson::value& args, picojson::object& out) {
+void SystemSettingInstance::SystemSettingManagerSetProperty(const picojson::value& args,
+                                                            picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeSetting, &out);
diff --git a/src/time/time_instance.cc b/src/time/time_instance.cc
index 4098431..f331529 100644
--- a/src/time/time_instance.cc
+++ b/src/time/time_instance.cc
@@ -19,8 +19,7 @@ TimeInstance::TimeInstance() : manager_(this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&TimeInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&TimeInstance::M, this, _1, _2))
   REGISTER_METHOD(TimeUtilGetAvailableTimezones);
   REGISTER_METHOD(TimeUtilGetDateFormat);
   REGISTER_METHOD(TimeUtilGetTimeFormat);
@@ -48,7 +47,7 @@ TimeInstance::~TimeInstance() {
 }
 
 void TimeInstance::TimeUtilGetAvailableTimezones(const picojson::value& /*args*/,
-                                                  picojson::object& out) {
+                                                 picojson::object& out) {
   ScopeLogger();
   picojson::value result = picojson::value(picojson::object());
   picojson::object& result_obj = result.get<picojson::object>();
@@ -87,8 +86,7 @@ void TimeInstance::TimeUtilGetDateFormat(const picojson::value& args, picojson::
   ReportSuccess(result, out);
 }
 
-void TimeInstance::TimeUtilGetTimeFormat(const picojson::value& /* args */,
-                                          picojson::object& out) {
+void TimeInstance::TimeUtilGetTimeFormat(const picojson::value& /* args */, picojson::object& out) {
   ScopeLogger();
   std::string format;
   PlatformResult res = TimeUtilTools::GetTimeFormat(&format);
@@ -105,7 +103,7 @@ void TimeInstance::TimeUtilGetTimeFormat(const picojson::value& /* args */,
 }
 
 void TimeInstance::TimeUtilSetDateTimeChangeListener(const picojson::value& /*args*/,
-                                                      picojson::object& out) {
+                                                     picojson::object& out) {
   ScopeLogger();
   PlatformResult res = manager_.RegisterVconfCallback(kTimeChange);
   if (res.IsError()) {
@@ -115,7 +113,7 @@ void TimeInstance::TimeUtilSetDateTimeChangeListener(const picojson::value& /*ar
 }
 
 void TimeInstance::TimeUtilUnsetDateTimeChangeListener(const picojson::value& /*args*/,
-                                                        picojson::object& out) {
+                                                       picojson::object& out) {
   ScopeLogger();
   PlatformResult res = manager_.UnregisterVconfCallback(kTimeChange);
   if (res.IsError()) {
@@ -125,7 +123,7 @@ void TimeInstance::TimeUtilUnsetDateTimeChangeListener(const picojson::value& /*
 }
 
 void TimeInstance::TimeUtilSetTimezoneChangeListener(const picojson::value& /*args*/,
-                                                      picojson::object& out) {
+                                                     picojson::object& out) {
   ScopeLogger();
   PlatformResult res = manager_.RegisterVconfCallback(kTimezoneChange);
   if (res.IsError()) {
@@ -135,7 +133,7 @@ void TimeInstance::TimeUtilSetTimezoneChangeListener(const picojson::value& /*ar
 }
 
 void TimeInstance::TimeUtilUnsetTimezoneChangeListener(const picojson::value& /*args*/,
-                                                        picojson::object& out) {
+                                                       picojson::object& out) {
   ScopeLogger();
   PlatformResult res = manager_.UnregisterVconfCallback(kTimezoneChange);
   if (res.IsError()) {
@@ -244,7 +242,7 @@ void TimeInstance::TZDateToString(const picojson::value& args, picojson::object&
 }
 
 void TimeInstance::TZDateGetTimezoneAbbreviation(const picojson::value& args,
-                                                  picojson::object& out) {
+                                                 picojson::object& out) {
   ScopeLogger();
   LoggerW(
       "DEPRECATION WARNING: getTimezoneAbbreviation() is deprecated and will be removed from next "
@@ -301,7 +299,7 @@ void TimeInstance::TZDateIsDST(const picojson::value& args, picojson::object& ou
 }
 
 void TimeInstance::TZDateGetPreviousDSTTransition(const picojson::value& args,
-                                                   picojson::object& out) {
+                                                  picojson::object& out) {
   ScopeLogger();
   if (!args.contains("timezone") || !args.contains("timestamp")) {
     LogAndReportError(PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter passed."),
diff --git a/src/utils/utils_instance.cc b/src/utils/utils_instance.cc
index 3666482..e90f8b2 100644
--- a/src/utils/utils_instance.cc
+++ b/src/utils/utils_instance.cc
@@ -24,8 +24,7 @@ UtilsInstance::UtilsInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&UtilsInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&UtilsInstance::M, this, _1, _2))
   REGISTER_METHOD(UtilsGetPkgApiVersion);
   REGISTER_METHOD(UtilsCheckPrivilegeAccess);
   REGISTER_METHOD(UtilsCheckBackwardCompabilityPrivilegeAccess);
@@ -54,7 +53,7 @@ void UtilsInstance::UtilsCheckPrivilegeAccess(const picojson::value& args, picoj
 }
 
 void UtilsInstance::UtilsCheckBackwardCompabilityPrivilegeAccess(const picojson::value& args,
-                                                            picojson::object& out) {
+                                                                 picojson::object& out) {
   ScopeLogger();
   const auto& current_priv = args.get("current_privilege").to_str();
   const auto& prev_priv = args.get("previous_privilege").to_str();
diff --git a/src/utils/utils_instance.h b/src/utils/utils_instance.h
index 0d21682..5708a92 100644
--- a/src/utils/utils_instance.h
+++ b/src/utils/utils_instance.h
@@ -24,7 +24,8 @@ class UtilsInstance : public common::ParsedInstance {
  private:
   void UtilsGetPkgApiVersion(const picojson::value& args, picojson::object& out);
   void UtilsCheckPrivilegeAccess(const picojson::value& args, picojson::object& out);
-  void UtilsCheckBackwardCompabilityPrivilegeAccess(const picojson::value& args, picojson::object& out);
+  void UtilsCheckBackwardCompabilityPrivilegeAccess(const picojson::value& args,
+                                                    picojson::object& out);
 
   void UtilsToLongLong(const picojson::value& args, picojson::object& out);
   void UtilsToUnsignedLongLong(const picojson::value& args, picojson::object& out);
diff --git a/src/voicecontrol/voicecontrol_instance.cc b/src/voicecontrol/voicecontrol_instance.cc
index 770ec74..4b12186 100644
--- a/src/voicecontrol/voicecontrol_instance.cc
+++ b/src/voicecontrol/voicecontrol_instance.cc
@@ -44,7 +44,7 @@ VoiceControlInstance::VoiceControlInstance() : voice_control_client() {
   using namespace std::placeholders;
 
 #define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&VoiceControlInstance::M, this, _1, _2))
+  RegisterSyncHandler(#M, std::bind(&VoiceControlInstance::M, this, _1, _2))
   REGISTER_METHOD(VoiceControlClientGetCurrentLanguage);
   REGISTER_METHOD(VoiceControlClientSetCommandList);
   REGISTER_METHOD(VoiceControlClientUnsetCommandList);
@@ -72,8 +72,8 @@ VoiceControlInstance::~VoiceControlInstance() {
     return;                                                                  \
   }
 
-void VoiceControlInstance::VoiceControlClientManagerGetVoiceControlClient(const picojson::value& args,
-                                                 picojson::object& out) {
+void VoiceControlInstance::VoiceControlClientManagerGetVoiceControlClient(
+    const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeVoiceControl, &out);
@@ -119,7 +119,8 @@ void VoiceControlInstance::VoiceControlClientManagerGetVoiceControlClient(const
   ReportSuccess(out);
 }
 
-void VoiceControlInstance::VoiceControlClientRelease(const picojson::value& args, picojson::object& out) {
+void VoiceControlInstance::VoiceControlClientRelease(const picojson::value& args,
+                                                     picojson::object& out) {
   ScopeLogger();
   int ret = VC_ERROR_NONE;
 
@@ -150,7 +151,8 @@ void VoiceControlInstance::VoiceControlClientRelease(const picojson::value& args
   ReportSuccess(out);
 }
 
-void VoiceControlInstance::VoiceControlClientGetCurrentLanguage(const picojson::value& args, picojson::object& out) {
+void VoiceControlInstance::VoiceControlClientGetCurrentLanguage(const picojson::value& args,
+                                                                picojson::object& out) {
   ScopeLogger();
 
   std::string language;
@@ -163,7 +165,8 @@ void VoiceControlInstance::VoiceControlClientGetCurrentLanguage(const picojson::
   }
 }
 
-void VoiceControlInstance::VoiceControlClientSetCommandList(const picojson::value& args, picojson::object& out) {
+void VoiceControlInstance::VoiceControlClientSetCommandList(const picojson::value& args,
+                                                            picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeVoiceControl, &out);
 
@@ -182,7 +185,8 @@ void VoiceControlInstance::VoiceControlClientSetCommandList(const picojson::valu
   }
 }
 
-void VoiceControlInstance::VoiceControlClientUnsetCommandList(const picojson::value& args, picojson::object& out) {
+void VoiceControlInstance::VoiceControlClientUnsetCommandList(const picojson::value& args,
+                                                              picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeVoiceControl, &out);
 
@@ -199,7 +203,8 @@ void VoiceControlInstance::VoiceControlClientUnsetCommandList(const picojson::va
   }
 }
 
-void VoiceControlInstance::VoiceControlClientAddResultListener(const picojson::value& args, picojson::object& out) {
+void VoiceControlInstance::VoiceControlClientAddResultListener(const picojson::value& args,
+                                                               picojson::object& out) {
   ScopeLogger();
 
   common::PlatformResult result = voice_control_client.AddResultListener();
@@ -212,7 +217,7 @@ void VoiceControlInstance::VoiceControlClientAddResultListener(const picojson::v
 }
 
 void VoiceControlInstance::VoiceControlClientRemoveResultListener(const picojson::value& args,
-                                                picojson::object& out) {
+                                                                  picojson::object& out) {
   ScopeLogger();
 
   common::PlatformResult result = voice_control_client.RemoveResultListener();
@@ -225,7 +230,7 @@ void VoiceControlInstance::VoiceControlClientRemoveResultListener(const picojson
 }
 
 void VoiceControlInstance::VoiceControlClientAddLanguageChangeListener(const picojson::value& args,
-                                                     picojson::object& out) {
+                                                                       picojson::object& out) {
   ScopeLogger();
 
   common::PlatformResult result = voice_control_client.AddLanguageChangeListener();
@@ -237,8 +242,8 @@ void VoiceControlInstance::VoiceControlClientAddLanguageChangeListener(const pic
   }
 }
 
-void VoiceControlInstance::VoiceControlClientRemoveLanguageChangeListener(const picojson::value& args,
-                                                        picojson::object& out) {
+void VoiceControlInstance::VoiceControlClientRemoveLanguageChangeListener(
+    const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   common::PlatformResult result = voice_control_client.RemoveLanguageChangeListener();
diff --git a/src/voicecontrol/voicecontrol_instance.h b/src/voicecontrol/voicecontrol_instance.h
index 1e4502f..4e7881f 100644
--- a/src/voicecontrol/voicecontrol_instance.h
+++ b/src/voicecontrol/voicecontrol_instance.h
@@ -31,7 +31,8 @@ class VoiceControlInstance : public common::ParsedInstance {
   virtual ~VoiceControlInstance();
 
  private:
-  void VoiceControlClientManagerGetVoiceControlClient(const picojson::value& args, picojson::object& out);
+  void VoiceControlClientManagerGetVoiceControlClient(const picojson::value& args,
+                                                      picojson::object& out);
   void VoiceControlClientRelease(const picojson::value& args, picojson::object& out);
 
   void VoiceControlClientGetCurrentLanguage(const picojson::value& args, picojson::object& out);
@@ -39,8 +40,10 @@ class VoiceControlInstance : public common::ParsedInstance {
   void VoiceControlClientUnsetCommandList(const picojson::value& args, picojson::object& out);
   void VoiceControlClientAddResultListener(const picojson::value& args, picojson::object& out);
   void VoiceControlClientRemoveResultListener(const picojson::value& args, picojson::object& out);
-  void VoiceControlClientAddLanguageChangeListener(const picojson::value& args, picojson::object& out);
-  void VoiceControlClientRemoveLanguageChangeListener(const picojson::value& args, picojson::object& out);
+  void VoiceControlClientAddLanguageChangeListener(const picojson::value& args,
+                                                   picojson::object& out);
+  void VoiceControlClientRemoveLanguageChangeListener(const picojson::value& args,
+                                                      picojson::object& out);
 
   static void VcLanguageChangedCb(const char* previous, const char* current, void* user_data);
   static void VcResultCb(vc_result_event_e event, vc_cmd_list_h cmd_list, const char* result,
diff --git a/src/widgetservice/widgetservice_instance.cc b/src/widgetservice/widgetservice_instance.cc
index 263b71b..082c693 100644
--- a/src/widgetservice/widgetservice_instance.cc
+++ b/src/widgetservice/widgetservice_instance.cc
@@ -167,8 +167,7 @@ WidgetServiceInstance::WidgetServiceInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_METHOD(M) \
-    RegisterSyncHandler(#M, std::bind(&WidgetServiceInstance::M, this, _1))
+#define REGISTER_METHOD(M) RegisterSyncHandler(#M, std::bind(&WidgetServiceInstance::M, this, _1))
   REGISTER_METHOD(WidgetServiceManagerGetWidget);
   REGISTER_METHOD(WidgetServiceManagerGetPrimaryWidgetId);
   REGISTER_METHOD(WidgetServiceManagerGetSize);
@@ -180,8 +179,7 @@ WidgetServiceInstance::WidgetServiceInstance() {
   REGISTER_METHOD(WidgetInstanceSendContent);
 #undef REGISTER_METHOD
 
-#define REGISTER_METHOD(M) \
-    RegisterHandler(#M, std::bind(&WidgetServiceInstance::M, this, _1, _2))
+#define REGISTER_METHOD(M) RegisterHandler(#M, std::bind(&WidgetServiceInstance::M, this, _1, _2))
   REGISTER_METHOD(WidgetServiceManagerGetWidgets);
   REGISTER_METHOD(WidgetGetInstances);
   REGISTER_METHOD(WidgetGetVariants);
@@ -224,7 +222,7 @@ TizenResult WidgetServiceInstance::WidgetServiceManagerGetWidget(const picojson:
 }
 
 TizenResult WidgetServiceInstance::WidgetServiceManagerGetWidgets(const picojson::object& args,
-                                              const common::AsyncToken& token) {
+                                                                  const common::AsyncToken& token) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeWidgetService);
@@ -266,7 +264,8 @@ TizenResult WidgetServiceInstance::WidgetServiceManagerGetWidgets(const picojson
   return TizenSuccess();
 }
 
-TizenResult WidgetServiceInstance::WidgetServiceManagerGetPrimaryWidgetId(const picojson::object& args) {
+TizenResult WidgetServiceInstance::WidgetServiceManagerGetPrimaryWidgetId(
+    const picojson::object& args) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeWidgetService);
@@ -339,7 +338,7 @@ TizenResult WidgetServiceInstance::WidgetGetName(picojson::object const& args) {
 }
 
 TizenResult WidgetServiceInstance::WidgetGetInstances(picojson::object const& args,
-                                                const common::AsyncToken& token) {
+                                                      const common::AsyncToken& token) {
   ScopeLogger();
 
   CHECK_EXIST(args, kWidgetId, out)
@@ -404,7 +403,7 @@ TizenResult WidgetServiceInstance::WidgetGetVariant(picojson::object const& args
 }
 
 TizenResult WidgetServiceInstance::WidgetGetVariants(picojson::object const& args,
-                                               const common::AsyncToken& token) {
+                                                     const common::AsyncToken& token) {
   ScopeLogger();
 
   CHECK_PRIVILEGE(kPrivilegeWidgetService);
@@ -602,7 +601,7 @@ TizenResult WidgetServiceInstance::WidgetInstanceSendContent(picojson::object co
 }
 
 TizenResult WidgetServiceInstance::WidgetInstanceGetContent(picojson::object const& args,
-                                              const common::AsyncToken& token) {
+                                                            const common::AsyncToken& token) {
   ScopeLogger();
 
   CHECK_EXIST(args, kWidgetId, out)
diff --git a/src/widgetservice/widgetservice_instance.h b/src/widgetservice/widgetservice_instance.h
index 9a6fb59..81b2da4 100644
--- a/src/widgetservice/widgetservice_instance.h
+++ b/src/widgetservice/widgetservice_instance.h
@@ -34,20 +34,24 @@ class WidgetServiceInstance : public common::TizenInstance {
  private:
   // WidgetManager
   common::TizenResult WidgetServiceManagerGetWidget(picojson::object const& args);
-  common::TizenResult WidgetServiceManagerGetWidgets(picojson::object const& args, const common::AsyncToken& token);
+  common::TizenResult WidgetServiceManagerGetWidgets(picojson::object const& args,
+                                                     const common::AsyncToken& token);
   common::TizenResult WidgetServiceManagerGetPrimaryWidgetId(picojson::object const& args);
   common::TizenResult WidgetServiceManagerGetSize(picojson::object const& args);
   // Widget
   common::TizenResult WidgetGetName(picojson::object const& args);
-  common::TizenResult WidgetGetInstances(picojson::object const& args, const common::AsyncToken& token);
+  common::TizenResult WidgetGetInstances(picojson::object const& args,
+                                         const common::AsyncToken& token);
   common::TizenResult WidgetGetVariant(picojson::object const& args);
-  common::TizenResult WidgetGetVariants(picojson::object const& args, const common::AsyncToken& token);
+  common::TizenResult WidgetGetVariants(picojson::object const& args,
+                                        const common::AsyncToken& token);
   common::TizenResult WidgetAddStateChangeListener(picojson::object const& args);
   common::TizenResult WidgetRemoveStateChangeListener(picojson::object const& args);
   // WidgetInstance
   common::TizenResult WidgetInstanceChangeUpdatePeriod(picojson::object const& args);
   common::TizenResult WidgetInstanceSendContent(picojson::object const& args);
-  common::TizenResult WidgetInstanceGetContent(picojson::object const& args, const common::AsyncToken& token);
+  common::TizenResult WidgetInstanceGetContent(picojson::object const& args,
+                                               const common::AsyncToken& token);
 
   static std::mutex listener_mutex_;
   std::map<std::string, int> listener_map_;
diff --git a/tools/codestyle/c++_clang_formatter.sh b/tools/codestyle/c++_clang_formatter.sh
index 25f963a..e014c73 100755
--- a/tools/codestyle/c++_clang_formatter.sh
+++ b/tools/codestyle/c++_clang_formatter.sh
@@ -33,8 +33,8 @@ AllowShortFunctionsOnASingleLine: false,
 
 formatC++() {
   printf "."
-  find -- "$1" -type f \( -name '*.cc' -o -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) \
-    -print0 | xargs --null --no-run-if-empty clang-format -i -style="$config"
+  find -- "$1" -type f \( -name '*.cc' -o -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) | \
+    grep -v 'src/google' | xargs -n1 --no-run-if-empty clang-format -i -style="$config"
 }
 
 checkUpdatedFiles() {