Revert "[shill] Provide a cmd line toggle between flimflam and shill storage dirs"
This reverts commit 54c93e972563b713030a15ce3c1c1824800e317f
Change-Id: Id4bf4ee1e7e62efea5d116507d8b49d76a7a9556
Reviewed-on: http://gerrit.chromium.org/gerrit/6567
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 6e451c5..a5cb0e4 100644
--- a/property_store_unittest.h
+++ b/property_store_unittest.h
@@ -9,10 +9,9 @@
#include <string>
#include <vector>
-#include <base/memory/scoped_temp_dir.h>
#include <dbus-c++/dbus.h>
-#include <gmock/gmock.h>
#include <gtest/gtest.h>
+#include <gmock/gmock.h>
#include "shill/dbus_adaptor.h"
#include "shill/error.h"
@@ -47,8 +46,6 @@
virtual ~PropertyStoreTest();
protected:
- ScopedTempDir run_dir_;
- ScopedTempDir storage_dir_;
MockControl control_interface_;
EventDispatcher dispatcher_;
Manager manager_;