summaryrefslogtreecommitdiffstats
path: root/chrome/common/pref_service_unittest.cc
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 23:39:34 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 23:39:34 +0000
commiteed9b070b545c0ae905cc8e5d32ff7c3a58b477c (patch)
treed92f61b5d71a75dc2e9ce0af2f64e1d7bff6e95a /chrome/common/pref_service_unittest.cc
parent87e0bab51554bb62f13ddc24455c28e1533bdc73 (diff)
downloadchromium_src-eed9b070b545c0ae905cc8e5d32ff7c3a58b477c.zip
chromium_src-eed9b070b545c0ae905cc8e5d32ff7c3a58b477c.tar.gz
chromium_src-eed9b070b545c0ae905cc8e5d32ff7c3a58b477c.tar.bz2
use #if 0 instead of DISABLED_.
Review URL: http://codereview.chromium.org/39078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/pref_service_unittest.cc')
-rw-r--r--chrome/common/pref_service_unittest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/common/pref_service_unittest.cc b/chrome/common/pref_service_unittest.cc
index a95455a..48b707a 100644
--- a/chrome/common/pref_service_unittest.cc
+++ b/chrome/common/pref_service_unittest.cc
@@ -82,7 +82,8 @@ class TestPrefObserver : public NotificationObserver {
} // anonymous namespace
// This test is disabled. See issue 8339.
-TEST_F(PrefServiceTest, DISABLED_Basic) {
+#if 0
+TEST_F(PrefServiceTest, Basic) {
PrefService prefs;
// Test that it fails on nonexistent file.
@@ -137,6 +138,7 @@ TEST_F(PrefServiceTest, DISABLED_Basic) {
ASSERT_TRUE(file_util::PathExists(golden_output_file));
ASSERT_TRUE(file_util::ContentsEqual(golden_output_file, output_file));
}
+#endif
TEST_F(PrefServiceTest, Overlay) {
const std::string transient =