[shill] Get rid of protected data members in PropertyStoreTest
BUG=chromium-os:19573
TEST=unit
STATUS=Verified
Change-Id: Ib3a2f19abb8cc4aa0e8410fc26bbb60891e35da7
Reviewed-on: http://gerrit.chromium.org/gerrit/7762
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
diff --git a/property_store_unittest.h b/property_store_unittest.h
index 0fb3472..639649f 100644
--- a/property_store_unittest.h
+++ b/property_store_unittest.h
@@ -51,6 +51,9 @@
protected:
Manager *manager() { return &manager_; }
+ MockControl *control_interface() { return &control_interface_; }
+ EventDispatcher *dispatcher() { return &dispatcher_; }
+ MockGLib *glib() { return &glib_; }
const std::string &run_path() const { return path_; }
const std::string &storage_path() const { return path_; }
@@ -58,18 +61,15 @@
const std::string &invalid_args() const { return invalid_args_; }
const std::string &invalid_prop() const { return invalid_prop_; }
- // TODO(cmasone): make these private as per http://crosbug.com/19573
- MockControl control_interface_;
- EventDispatcher dispatcher_;
- MockGLib glib_;
-
private:
const std::string invalid_args_;
const std::string invalid_prop_;
ScopedTempDir dir_;
const std::string path_;
+ MockControl control_interface_;
+ EventDispatcher dispatcher_;
+ MockGLib glib_;
Manager manager_;
-
};
} // namespace shill