commit d3df25fb62011b3f76d33545467c71de3aca771d
author Gilad Arnold <garnold@chromium.org> Tue Apr 22 08:39:48 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Apr 23 07:02:48 2014 +0000
tree d971edeaae30345c7ca0a606dc854a42c7ec7bf9
parent ef120fac0ff6364aaa8c6d05339065f118be25ac

PM: Switch RealShillprovider to use AsyncCopyVariables.

This change makes sense because shill values are now tied to
asynchronous DBus notifications. It also reduces much of the logic for
guarding attribute values, which is now handled internally by the
AsyncCopyVariable.

BUG=chromium:364997
TEST=Unit tests.

Change-Id: Ief5fffba821013f192a4029c2765c48bc2ed91c5
Reviewed-on: https://chromium-review.googlesource.com/196216
Tested-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>

policy_manager/real_shill_provider.h

diff --git a/policy_manager/real_shill_provider.h b/policy_manager/real_shill_provider.h
index 833e147..cd5ee06 100644
--- a/policy_manager/real_shill_provider.h
+++ b/policy_manager/real_shill_provider.h
@@ -56,11 +56,6 @@
   virtual bool DoInit() override;
 
  private:
-  // Default error strings for variables.
-  static const char* kConnStatusUnavailable;
-  static const char* kConnTypeUnavailable;
-  static const char* kConnTetheringUnavailable;
-
   // Return a DBus proxy for a given |path| and |interface| within shill.
   DBusGProxy* GetProxy(const char* path, const char* interface);
 
@@ -77,23 +72,6 @@
   static void HandlePropertyChangedStatic(DBusGProxy* proxy, const char* name,
                                           GValue* value, void* data);
 
-  // Whether the connection status has been properly initialized.
-  bool is_conn_status_init_ = false;
-
-  // The time when the connection type last changed.
-  base::Time conn_last_changed_;
-
-  // The current connection status.
-  bool is_connected_;
-
-  // The default connection type and whether its value is valid.
-  ConnectionType conn_type_;
-  bool conn_type_is_valid_ = false;
-
-  // The default connection tethering mode and whether its value is valid.
-  ConnectionTethering conn_tethering_;
-  bool conn_tethering_is_valid_ = false;
-
   // The current default service path, if connected.
   std::string default_service_path_;
 
@@ -105,19 +83,11 @@
   // A clock abstraction (mockable).
   ClockInterface* const clock_;
 
-  // The provider's variable.
-  CopyVariable<bool> var_is_connected_{
-      "is_connected", kVariableModePoll, is_connected_, &is_conn_status_init_,
-      kConnStatusUnavailable};
-  CopyVariable<ConnectionType> var_conn_type_{
-      "conn_type", kVariableModePoll, conn_type_, &conn_type_is_valid_,
-      kConnTypeUnavailable};
-  CopyVariable<ConnectionTethering> var_conn_tethering_{
-      "conn_tethering", kVariableModePoll, conn_tethering_,
-      &conn_tethering_is_valid_, kConnTetheringUnavailable};
-  CopyVariable<base::Time> var_conn_last_changed_{
-      "conn_last_changed", kVariableModePoll, conn_last_changed_,
-      &is_conn_status_init_, kConnStatusUnavailable};
+  // The provider's variables.
+  AsyncCopyVariable<bool> var_is_connected_{"is_connected"};
+  AsyncCopyVariable<ConnectionType> var_conn_type_{"conn_type"};
+  AsyncCopyVariable<ConnectionTethering> var_conn_tethering_{"conn_tethering"};
+  AsyncCopyVariable<base::Time> var_conn_last_changed_{"conn_last_changed"};
 
   DISALLOW_COPY_AND_ASSIGN(RealShillProvider);
 };