commit d732bd0c60802394484894035fa3f21505382823
author Christopher Wiley <wiley@chromium.org> Tue Apr 07 11:11:18 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Tue Apr 07 21:41:47 2015 +0000
tree 543a40dc60b2ee578ccd945cf3db85179140aadc
parent fc575a49805ad5f991a3052bf29dd064ceedb46c

buffet: Add flag to disable XMPP support

As a temporary work around to major source of flake in tests, allow
disabling XMPP support in tests.

BUG=brillo:769
TEST=FEATURES="test" USE="clang asan" emerge-gizmo buffet && \
     FEATURES="test" emerge-gizmo buffet

Change-Id: I41ca92bb77b77132c1a20c7018b0ce737b69cf60
Reviewed-on: https://chromium-review.googlesource.com/264392
Tested-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>

buffet/device_registration_info.cc

diff --git a/buffet/device_registration_info.cc b/buffet/device_registration_info.cc
index b16e626..a87436d 100644
--- a/buffet/device_registration_info.cc
+++ b/buffet/device_registration_info.cc
@@ -126,12 +126,14 @@
     std::unique_ptr<const BuffetConfig> config,
     const std::shared_ptr<chromeos::http::Transport>& transport,
     const std::shared_ptr<StorageInterface>& state_store,
+    bool xmpp_enabled,
     const base::Closure& on_status_changed)
     : transport_{transport},
       storage_{state_store},
       command_manager_{command_manager},
       state_manager_{state_manager},
       config_{std::move(config)},
+      xmpp_enabled_{xmpp_enabled},
       on_status_changed_{on_status_changed} {
 }
 
@@ -340,6 +342,10 @@
 }
 
 void DeviceRegistrationInfo::StartXmpp() {
+  if (!xmpp_enabled_) {
+    LOG(WARNING) << "XMPP support disabled by flag.";
+    return;
+  }
   // If no MessageLoop assume we're in unittests.
   if (!base::MessageLoop::current()) {
     LOG(INFO) << "No MessageLoop, not starting XMPP";