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/default_profile_unittest.cc b/default_profile_unittest.cc
index bd6760c..44d755d 100644
--- a/default_profile_unittest.cc
+++ b/default_profile_unittest.cc
@@ -1,4 +1,4 @@
- // Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -27,22 +27,17 @@
: profile_(new DefaultProfile(&control_interface_,
&glib_,
&manager_,
- FilePath(kTestStoragePath),
properties_)) {
}
virtual ~DefaultProfileTest() {}
protected:
- static const char kTestStoragePath[];
-
ProfileRefPtr profile_;
GLib glib_;
Manager::Properties properties_;
};
-const char DefaultProfileTest::kTestStoragePath[] = "/no/where";
-
TEST_F(DefaultProfileTest, GetProperties) {
Error error(Error::kInvalidProperty, "");
{
@@ -69,10 +64,4 @@
}
}
-TEST_F(DefaultProfileTest, GetStoragePath) {
- FilePath path;
- EXPECT_TRUE(profile_->GetStoragePath(&path));
- EXPECT_EQ(string(kTestStoragePath)+"/default.profile", path.value());
-}
-
} // namespace shill