commit 4e89e2cfcf17ddc8412e6eee7b91a31954f55f54
author David Zeuthen <zeuthen@chromium.org> Thu Apr 24 11:47:00 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Apr 24 23:50:02 2014 +0000
tree b30f649254a6d116c01dd64218aafdbd5d6f15bb
parent cc0e5cf2bc2c480196692b76d8ce5c4268de8e72

PM: Make State an abstract interface.

Similar to CL:196656, move getters/variables to concrete
subclasses. In this case, also introduce a RealState type to achieve
this.

BUG=chromium:364763
TEST=Unit tests pass.

Change-Id: Ic12cd872e576c9690d32359474f3528cf706633d
Reviewed-on: https://chromium-review.googlesource.com/196885
Reviewed-by: David Zeuthen <zeuthen@chromium.org>
Commit-Queue: David Zeuthen <zeuthen@chromium.org>
Tested-by: David Zeuthen <zeuthen@chromium.org>

policy_manager/state.h

diff --git a/policy_manager/state.h b/policy_manager/state.h
index 23c2d6e..39abbad 100644
--- a/policy_manager/state.h
+++ b/policy_manager/state.h
@@ -20,43 +20,21 @@
 class State {
  public:
   virtual ~State() {}
-  State(ConfigProvider* config_provider,
-        DevicePolicyProvider* device_policy_provider,
-        RandomProvider* random_provider,
-        ShillProvider* shill_provider,
-        SystemProvider* system_provider,
-        TimeProvider* time_provider,
-        UpdaterProvider* updater_provider) :
-      config_provider_(config_provider),
-      device_policy_provider_(device_policy_provider),
-      random_provider_(random_provider),
-      shill_provider_(shill_provider),
-      system_provider_(system_provider),
-      time_provider_(time_provider),
-      updater_provider_(updater_provider) {}
 
   // These methods return the given provider.
-  virtual ConfigProvider* config_provider() { return config_provider_.get(); }
-  virtual DevicePolicyProvider* device_policy_provider() {
-    return device_policy_provider_.get();
-  }
-  virtual RandomProvider* random_provider() { return random_provider_.get(); }
-  virtual ShillProvider* shill_provider() { return shill_provider_.get(); }
-  virtual SystemProvider* system_provider() { return system_provider_.get(); }
-  virtual TimeProvider* time_provider() { return time_provider_.get(); }
-  virtual UpdaterProvider* updater_provider() {
-    return updater_provider_.get();
-  }
+  virtual ConfigProvider* config_provider() = 0;
+  virtual DevicePolicyProvider* device_policy_provider() = 0;
+  virtual RandomProvider* random_provider() = 0;
+  virtual ShillProvider* shill_provider() = 0;
+  virtual SystemProvider* system_provider() = 0;
+  virtual TimeProvider* time_provider() = 0;
+  virtual UpdaterProvider* updater_provider() = 0;
+
+ protected:
+  State() {}
 
  private:
-  // Instances of the providers.
-  scoped_ptr<ConfigProvider> config_provider_;
-  scoped_ptr<DevicePolicyProvider> device_policy_provider_;
-  scoped_ptr<RandomProvider> random_provider_;
-  scoped_ptr<ShillProvider> shill_provider_;
-  scoped_ptr<SystemProvider> system_provider_;
-  scoped_ptr<TimeProvider> time_provider_;
-  scoped_ptr<UpdaterProvider> updater_provider_;
+  DISALLOW_COPY_AND_ASSIGN(State);
 };
 
 }  // namespace chromeos_policy_manager