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

chrome/service/cloud_print/connector_settings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/service/cloud_print/connector_settings.h"
 
 #include "base/values.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/service/cloud_print/cloud_print_consts.h"
 #include "chrome/service/cloud_print/print_system.h"
 #include "chrome/service/service_process_prefs.h"
 
 namespace {
 
 const char kDefaultCloudPrintServerUrl[] = "https://www.google.com/cloudprint";
 const char kDeleteOnEnumFail[] = "delete_on_enum_fail";
 
 }  // namespace
 
 ConnectorSettings::ConnectorSettings()

[Vitaly Buka (NO REVIEWS), 2012/10/22 20:52:53]

pleas update connector_settings_unittest.cc 

[gene, 2012/10/22 21:44:12]

Done.

     : delete_on_enum_fail_(false),
-      connect_new_printers_(true) {
+      connect_new_printers_(true),

[Vitaly Buka (NO REVIEWS), 2012/10/22 20:52:53]

xmpp_ping_enabled_ is not initialized

[gene, 2012/10/22 21:44:12]

Done.

+      xmpp_ping_timeout_sec_(kDefaultXmppPingTimeoutSecs) {
 }
 
 ConnectorSettings::~ConnectorSettings() {
 }
 
 void ConnectorSettings::InitFrom(ServiceProcessPrefs* prefs) {
   CopyFrom(ConnectorSettings());
 
   proxy_id_ = prefs->GetString(prefs::kCloudPrintProxyId, "");
   if (proxy_id_.empty()) {
@@ skipping 16 matching lines @@
   // Check if there is an override for the cloud print server URL.
   server_url_ = GURL(prefs->GetString(prefs::kCloudPrintServiceURL, ""));
   DCHECK(server_url_.is_empty() || server_url_.is_valid());
   if (server_url_.is_empty() || !server_url_.is_valid()) {
     server_url_ = GURL(kDefaultCloudPrintServerUrl);
   }
   DCHECK(server_url_.is_valid());
 
   connect_new_printers_ = prefs->GetBoolean(
       prefs::kCloudPrintConnectNewPrinters, true);
+
+  xmpp_ping_enabled_ = prefs->GetBoolean(
+      prefs::kCloudPrintXmppPingEnabled, false);
+  xmpp_ping_timeout_sec_ = prefs->GetInt(
+      prefs::kCloudPrintXmppPingTimeout, kDefaultXmppPingTimeoutSecs);
+
   const base::ListValue* printers = prefs->GetList(
       prefs::kCloudPrintPrinterBlacklist);
   if (printers) {
     for (size_t i = 0; i < printers->GetSize(); ++i) {
       std::string printer;
       if (printers->GetString(i, &printer))
         printer_blacklist_.insert(printer);
     }
   }
 }
 
 bool ConnectorSettings::IsPrinterBlacklisted(const std::string& name) const {
   return printer_blacklist_.find(name) != printer_blacklist_.end();
 };
 
 void ConnectorSettings::CopyFrom(const ConnectorSettings& source) {
   server_url_ = source.server_url();
   proxy_id_ = source.proxy_id();
   delete_on_enum_fail_ = source.delete_on_enum_fail();

[Vitaly Buka (NO REVIEWS), 2012/10/22 20:52:53]

xmpp_ping_enabled_ is not copied

That's why i'd just use xmpp_ping_timeout_sec_ = 0 and function
is_xmpp_ping_enabled() {return xmpp_ping_timeout_sec_ != 0}

[gene, 2012/10/22 21:44:12]

Done.

   connect_new_printers_ = source.connect_new_printers();
+  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());
 }