Adding XMPP ping functionality to CLoudPrint. XMPP ping and timeout is controlled thorugh Service S…

chrome/service/cloud_print/connector_settings.cc

Index: chrome/service/cloud_print/connector_settings.cc
diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/cloud_print/connector_settings.cc
index 0976c422ccd22b451385d229e9059568c9066cfb..ccfc6e1867ff534c5531c0d4ec1b76d187106aef 100644
--- a/chrome/service/cloud_print/connector_settings.cc
+++ b/chrome/service/cloud_print/connector_settings.cc
@@ -19,7 +19,9 @@ const char kDeleteOnEnumFail[] = "delete_on_enum_fail";
 
 ConnectorSettings::ConnectorSettings()
     : delete_on_enum_fail_(false),
-      connect_new_printers_(true) {
+      connect_new_printers_(true),
+      xmpp_ping_enabled_(false),
+      xmpp_ping_timeout_sec_(kDefaultXmppPingTimeoutSecs) {
 }
 
 ConnectorSettings::~ConnectorSettings() {
@@ -56,6 +58,13 @@ void ConnectorSettings::InitFrom(ServiceProcessPrefs* prefs) {
 
   connect_new_printers_ = prefs->GetBoolean(
       prefs::kCloudPrintConnectNewPrinters, true);
+
+  xmpp_ping_enabled_ = prefs->GetBoolean(
+      prefs::kCloudPrintXmppPingEnabled, false);
+  int timeout = prefs->GetInt(
+      prefs::kCloudPrintXmppPingTimeout, kDefaultXmppPingTimeoutSecs);
+  SetXmppPingTimeoutSec(timeout);
+
   const base::ListValue* printers = prefs->GetList(
       prefs::kCloudPrintPrinterBlacklist);
   if (printers) {
@@ -76,8 +85,18 @@ void ConnectorSettings::CopyFrom(const ConnectorSettings& source) {
   proxy_id_ = source.proxy_id();
   delete_on_enum_fail_ = source.delete_on_enum_fail();
   connect_new_printers_ = source.connect_new_printers();
+  xmpp_ping_enabled_ = source.xmpp_ping_enabled();
+  xmpp_ping_timeout_sec_ = source.xmpp_ping_timeout_sec();
   printer_blacklist_ = source.printer_blacklist_;
   if (source.print_system_settings())
     print_system_settings_.reset(source.print_system_settings()->DeepCopy());
 }
 
+void ConnectorSettings::SetXmppPingTimeoutSec(int timeout) {
+  xmpp_ping_timeout_sec_ = timeout;
+  if (xmpp_ping_timeout_sec_ < kMinimumXmppPingTimeoutSecs) {
+    LOG(WARNING) <<

[akalin, 2012/10/25 00:51:10]

DLOG maybe?

[gene, 2012/10/25 01:06:22]

Actually, I would like to leave LOG here. That will indicate if customer have an
incorrect setting in Service State file.

+        "CP_CONNECTOR: XMPP ping timeout is less then minimal value";
+    xmpp_ping_timeout_sec_ = kMinimumXmppPingTimeoutSecs;
+  }
+}