Commit 8774009c authored by Muhammad Hasan Khan's avatar Muhammad Hasan Khan Committed by Commit Bot

login: use same observer list policy in real and fake concierge client

This change is needed to ensure that fake behaves the same as real
client and we can use it in the unit test to validate that arc
instance stopped is not fired on unrelated instance.

BUG=b:164816080
TEST=cq

Change-Id: Ice5e588b81231ac87b78dafd25188d6629b38bd5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469231
Auto-Submit: Muhammad Hasan Khan <mhasank@chromium.org>
Commit-Queue: Muhammad Hasan Khan <mhasank@chromium.org>
Reviewed-by: default avatarRyo Hashimoto <hashimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816907}
parent 89dbb21a
...@@ -428,13 +428,13 @@ class ConciergeClientImpl : public ConciergeClient { ...@@ -428,13 +428,13 @@ class ConciergeClientImpl : public ConciergeClient {
dbus::ObjectProxy* concierge_proxy_ = nullptr; dbus::ObjectProxy* concierge_proxy_ = nullptr;
base::ObserverList<Observer> observer_list_{ base::ObserverList<Observer> observer_list_{
base::ObserverListPolicy::EXISTING_ONLY}; ConciergeClient::kObserverListPolicy};
base::ObserverList<VmObserver>::Unchecked vm_observer_list_{ base::ObserverList<VmObserver>::Unchecked vm_observer_list_{
base::ObserverListPolicy::EXISTING_ONLY}; ConciergeClient::kObserverListPolicy};
base::ObserverList<ContainerObserver>::Unchecked container_observer_list_{ base::ObserverList<ContainerObserver>::Unchecked container_observer_list_{
base::ObserverListPolicy::EXISTING_ONLY}; ConciergeClient::kObserverListPolicy};
base::ObserverList<DiskImageObserver>::Unchecked disk_image_observer_list_{ base::ObserverList<DiskImageObserver>::Unchecked disk_image_observer_list_{
base::ObserverListPolicy::EXISTING_ONLY}; ConciergeClient::kObserverListPolicy};
bool is_vm_started_signal_connected_ = false; bool is_vm_started_signal_connected_ = false;
bool is_vm_stopped_signal_connected_ = false; bool is_vm_stopped_signal_connected_ = false;
......
...@@ -21,6 +21,9 @@ namespace chromeos { ...@@ -21,6 +21,9 @@ namespace chromeos {
// start and stop VMs, as well as for disk image management. // start and stop VMs, as well as for disk image management.
class COMPONENT_EXPORT(CHROMEOS_DBUS) ConciergeClient : public DBusClient { class COMPONENT_EXPORT(CHROMEOS_DBUS) ConciergeClient : public DBusClient {
public: public:
static constexpr base::ObserverListPolicy kObserverListPolicy =
base::ObserverListPolicy::EXISTING_ONLY;
// Used for observing Concierge service itself. // Used for observing Concierge service itself.
class Observer : public base::CheckedObserver { class Observer : public base::CheckedObserver {
public: public:
......
...@@ -332,13 +332,17 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) FakeConciergeClient ...@@ -332,13 +332,17 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) FakeConciergeClient
std::vector<vm_tools::concierge::DiskImageStatusResponse> std::vector<vm_tools::concierge::DiskImageStatusResponse>
disk_image_status_signals_; disk_image_status_signals_;
base::ObserverList<Observer> observer_list_; base::ObserverList<Observer> observer_list_{
ConciergeClient::kObserverListPolicy};
base::ObserverList<VmObserver>::Unchecked vm_observer_list_; base::ObserverList<VmObserver>::Unchecked vm_observer_list_{
ConciergeClient::kObserverListPolicy};
base::ObserverList<ContainerObserver>::Unchecked container_observer_list_; base::ObserverList<ContainerObserver>::Unchecked container_observer_list_{
ConciergeClient::kObserverListPolicy};
base::ObserverList<DiskImageObserver>::Unchecked disk_image_observer_list_; base::ObserverList<DiskImageObserver>::Unchecked disk_image_observer_list_{
ConciergeClient::kObserverListPolicy};
// Note: This should remain the last member so it'll be destroyed and // Note: This should remain the last member so it'll be destroyed and
// invalidate its weak pointers before any other members are destroyed. // invalidate its weak pointers before any other members are destroyed.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment