Re-land "[shill] Provide a cmd line toggle between flimflam and shill storage dirs"
This is so that we can easily switch to (and away from) using
the flimflam profile dir (and user profile dirs) when we start shill.
BUG=chromium-os:17253
TEST=unit
Change-Id: I0264162665607bb180688428c4640e42383ae355
Reviewed-on: http://gerrit.chromium.org/gerrit/6568
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/property_store_unittest.h b/property_store_unittest.h
index a5cb0e4..6e451c5 100644
--- a/property_store_unittest.h
+++ b/property_store_unittest.h
@@ -9,9 +9,10 @@
#include <string>
#include <vector>
+#include <base/memory/scoped_temp_dir.h>
#include <dbus-c++/dbus.h>
-#include <gtest/gtest.h>
#include <gmock/gmock.h>
+#include <gtest/gtest.h>
#include "shill/dbus_adaptor.h"
#include "shill/error.h"
@@ -46,6 +47,8 @@
virtual ~PropertyStoreTest();
protected:
+ ScopedTempDir run_dir_;
+ ScopedTempDir storage_dir_;
MockControl control_interface_;
EventDispatcher dispatcher_;
Manager manager_;