[Webseting] Google code style

[Verification] Related TCT should pass

Change-Id: Icb91aea9a256a84493c2e1bc5c8639b9657d263e
Signed-off-by: Ryszard Matuszyk <r.matuszyk@samsung.com>

diff --git a/src/websetting/websetting.cc b/src/websetting/websetting.cc
index f51dbcb0df4496817ff0f3970524ba1378e69342..2b3ccdc63a4c5bfdfaeb7b893aaa41b8ce261c90 100644 (file)
--- a/src/websetting/websetting.cc
+++ b/src/websetting/websetting.cc
@@ -17,14 +17,17 @@ namespace {
 
 const char kRuntimeServiceName[] = "org.crosswalkproject.Runtime1";
 const char kRuntimeRunningManagerPath[] = "/running1";
-const char kRuntimeRunningAppInterface[] = "org.crosswalkproject.Running.Application1";
+const char kRuntimeRunningAppInterface[] =
+    "org.crosswalkproject.Running.Application1";
 
 // The runtime process exports object for each running app on the session bus.
 GDBusProxy* CreateRunningAppProxy(const std::string& app_id) {
   GError* error = NULL;
-  GDBusConnection* connection = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
+  GDBusConnection* connection =
+      g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
   if (!connection) {
-    std::cerr << "Couldn't get the session bus connection: " << error->message << std::endl;
+    std::cerr << "Couldn't get the session bus connection: " << error->message
+              << std::endl;
     g_error_free(error);
     return NULL;
   }
@@ -35,12 +38,12 @@ GDBusProxy* CreateRunningAppProxy(const std::string& app_id) {
   // The d-bus proxy doesn't accept '.' character in object path
   // And that is why the substantiation is needed here.
   std::replace(path.begin(), path.end(), '.', '_');
-  GDBusProxy* proxy =
-      g_dbus_proxy_new_sync(connection, G_DBUS_PROXY_FLAGS_NONE, NULL, kRuntimeServiceName,
-                            path.c_str(), kRuntimeRunningAppInterface, NULL, &error);
+  GDBusProxy* proxy = g_dbus_proxy_new_sync(
+      connection, G_DBUS_PROXY_FLAGS_NONE, NULL, kRuntimeServiceName,
+      path.c_str(), kRuntimeRunningAppInterface, NULL, &error);
   if (!proxy) {
-    std::cerr << "Couldn't create proxy for " << kRuntimeRunningAppInterface << ": "
-              << error->message << std::endl;
+    std::cerr << "Couldn't create proxy for " << kRuntimeRunningAppInterface
+              << ": " << error->message << std::endl;
     g_error_free(error);
     return NULL;
   }
@@ -50,7 +53,8 @@ GDBusProxy* CreateRunningAppProxy(const std::string& app_id) {
 
 }  // namespace
 
-WebSetting::WebSetting(const std::string& app_id) : app_id_(app_id), running_app_proxy_(NULL) {}
+WebSetting::WebSetting(const std::string& app_id)
+    : app_id_(app_id), running_app_proxy_(NULL) {}
 
 WebSetting::~WebSetting() {
   if (running_app_proxy_) g_object_unref(running_app_proxy_);
@@ -62,27 +66,32 @@ std::unique_ptr<picojson::value> WebSetting::RemoveAllCookies() {
       return CreateResultMessage(ErrorCode::UNKNOWN_ERR);
   }
   GError* error = NULL;
-  GVariant* result = g_dbus_proxy_call_sync(running_app_proxy_, "RemoveAllCookies", NULL,
-                                            G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
+  GVariant* result =
+      g_dbus_proxy_call_sync(running_app_proxy_, "RemoveAllCookies", NULL,
+                             G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
   if (!result) {
-    std::cerr << "Fail to call 'RemoveuserAgentAllCookies':" << error->message << std::endl;
+    std::cerr << "Fail to call 'RemoveuserAgentAllCookies':" << error->message
+              << std::endl;
     g_error_free(error);
     return CreateResultMessage(ErrorCode::UNKNOWN_ERR);
   }
   return CreateResultMessage();
 }
 
-std::unique_ptr<picojson::value> WebSetting::SetUserAgentString(const std::string& user_agent) {
+std::unique_ptr<picojson::value> WebSetting::SetUserAgentString(
+    const std::string& user_agent) {
   if (!running_app_proxy_) {
     if (!(running_app_proxy_ = CreateRunningAppProxy(app_id_)))
       return CreateResultMessage(ErrorCode::UNKNOWN_ERR);
   }
   GError* error = NULL;
-  GVariant* result = g_dbus_proxy_call_sync(running_app_proxy_, "SetUserAgentString",
-                                            g_variant_new("(s)", user_agent.c_str()),
-                                            G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
+  GVariant* result =
+      g_dbus_proxy_call_sync(running_app_proxy_, "SetUserAgentString",
+                             g_variant_new("(s)", user_agent.c_str()),
+                             G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
   if (!result) {
-    std::cerr << "Fail to call 'SetUserAgentString':" << error->message << std::endl;
+    std::cerr << "Fail to call 'SetUserAgentString':" << error->message
+              << std::endl;
     g_error_free(error);
     return CreateResultMessage(ErrorCode::UNKNOWN_ERR);
   }

diff --git a/src/websetting/websetting.h b/src/websetting/websetting.h
index 390d0c488867abcb1f58646cd74626b91b0efcfd..8bb5674cac6bfc0c8c8095cc7711a371a1d0c71a 100644 (file)
--- a/src/websetting/websetting.h
+++ b/src/websetting/websetting.h
@@ -17,7 +17,8 @@ class WebSetting {
   ~WebSetting();
 
   std::unique_ptr<picojson::value> RemoveAllCookies();
-  std::unique_ptr<picojson::value> SetUserAgentString(const std::string& user_agent);
+  std::unique_ptr<picojson::value> SetUserAgentString(
+      const std::string& user_agent);
 
  private:
   std::string app_id_;

diff --git a/src/websetting/websetting_extension_utils.h b/src/websetting/websetting_extension_utils.h
index a859284a357e1fc2848e1527d259016cbf8ac9b5..8a3596589615d7f163e70e7f75108d2b45c3c826 100644 (file)
--- a/src/websetting/websetting_extension_utils.h
+++ b/src/websetting/websetting_extension_utils.h
@@ -17,25 +17,29 @@ std::unique_ptr<picojson::value> CreateResultMessage() {
   return std::unique_ptr<picojson::value>(new picojson::value(obj));
 }
 
-std::unique_ptr<picojson::value> CreateResultMessage(const common::ErrorCode& error) {
+std::unique_ptr<picojson::value> CreateResultMessage(
+    const common::ErrorCode& error) {
   picojson::object obj;
   obj["error"] = picojson::value(static_cast<double>(error));
   return std::unique_ptr<picojson::value>(new picojson::value(obj));
 }
 
-std::unique_ptr<picojson::value> CreateResultMessage(const picojson::object& data) {
+std::unique_ptr<picojson::value> CreateResultMessage(
+    const picojson::object& data) {
   picojson::object obj;
   obj["data"] = picojson::value(data);
   return std::unique_ptr<picojson::value>(new picojson::value(obj));
 }
 
-std::unique_ptr<picojson::value> CreateResultMessage(const picojson::array& data) {
+std::unique_ptr<picojson::value> CreateResultMessage(
+    const picojson::array& data) {
   picojson::object obj;
   obj["data"] = picojson::value(data);
   return std::unique_ptr<picojson::value>(new picojson::value(obj));
 }
 
-std::unique_ptr<picojson::value> CreateResultMessage(const picojson::value& data) {
+std::unique_ptr<picojson::value> CreateResultMessage(
+    const picojson::value& data) {
   picojson::object obj;
   obj["data"] = data;
   return std::unique_ptr<picojson::value>(new picojson::value(obj));

diff --git a/src/websetting/websetting_instance.cc b/src/websetting/websetting_instance.cc
index d255c6c5ce619b2775233f82f423a95573dc9d98..7fa7af754bc2e79152fb1a881e35789d3aa46605 100644 (file)
--- a/src/websetting/websetting_instance.cc
+++ b/src/websetting/websetting_instance.cc
@@ -14,7 +14,8 @@
 
 namespace {
 // The privileges that required in Websetting API
-const std::string kPrivilegeWebsetting = "http://tizen.org/privilege/websetting";
+const std::string kPrivilegeWebsetting =
+    "http://tizen.org/privilege/websetting";
 
 const char kWrtServiceName[] = "wrt-service";
 }  // namespace
@@ -29,11 +30,15 @@ typedef picojson::object JsonObject;
 typedef picojson::array JsonArray;
 typedef std::string JsonString;
 
-WebSettingInstance::WebSettingInstance(WebSettingExtension* extension) : extension_(extension) {
+WebSettingInstance::WebSettingInstance(WebSettingExtension* extension)
+    : extension_(extension) {
   using namespace std::placeholders;
-#define REGISTER_ASYNC(c, x) RegisterHandler(c, std::bind(&WebSettingInstance::x, this, _1, _2));
-  REGISTER_ASYNC("WebSettingManager_setUserAgentString", WebSettingManagerSetUserAgentString);
-  REGISTER_ASYNC("WebSettingManager_removeAllCookies", WebSettingManagerRemoveAllCookies);
+#define REGISTER_ASYNC(c, x) \
+  RegisterHandler(c, std::bind(&WebSettingInstance::x, this, _1, _2));
+  REGISTER_ASYNC("WebSettingManager_setUserAgentString",
+                 WebSettingManagerSetUserAgentString);
+  REGISTER_ASYNC("WebSettingManager_removeAllCookies",
+                 WebSettingManagerRemoveAllCookies);
 #undef REGISTER_ASYNC
 }
 

diff --git a/src/websetting/websetting_instance.h b/src/websetting/websetting_instance.h
index 200a2a25fab86c8551b1e331261d12e6b69b1508..86f39f99b8b83250102c8ce4e97ff2ab5a72ec72 100644 (file)
--- a/src/websetting/websetting_instance.h
+++ b/src/websetting/websetting_instance.h
@@ -20,8 +20,10 @@ class WebSettingInstance : public common::ParsedInstance {
   virtual ~WebSettingInstance();
 
  private:
-  void WebSettingManagerSetUserAgentString(const picojson::value& args, picojson::object& out);
-  void WebSettingManagerRemoveAllCookies(const picojson::value& args, picojson::object& out);
+  void WebSettingManagerSetUserAgentString(const picojson::value& args,
+                                           picojson::object& out);
+  void WebSettingManagerRemoveAllCookies(const picojson::value& args,
+                                         picojson::object& out);
 
   WebSettingExtension* extension_;
 };