summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-18 00:00:15 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-18 00:00:15 +0000
commitd35a2e432b7c21bbe667cebb53b636598eca13a9 (patch)
treee2f3a14a966f2c432653ca070f4874ff3419d5d9
parentcf6fd5b507b76c0787206a1642c66c61b2e58bec (diff)
downloadchromium_src-d35a2e432b7c21bbe667cebb53b636598eca13a9.zip
chromium_src-d35a2e432b7c21bbe667cebb53b636598eca13a9.tar.gz
chromium_src-d35a2e432b7c21bbe667cebb53b636598eca13a9.tar.bz2
Nukes PrefServiceUITest file deletion code in favor of DieFileDie,
which I suspect is causing purify ui test flakeyness. BUG=6557 TEST=none Review URL: http://codereview.chromium.org/20439 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9920 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/pref_service_uitest.cc11
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/common/pref_service_uitest.cc b/chrome/common/pref_service_uitest.cc
index a1736c3..ac218b5 100644
--- a/chrome/common/pref_service_uitest.cc
+++ b/chrome/common/pref_service_uitest.cc
@@ -57,16 +57,7 @@ public:
void TearDown() {
UITest::TearDown();
- const int kWaitForDeleteMs = 100;
- int num_retries = 5;
- while (num_retries > 0) {
- file_util::Delete(tmp_profile_, true);
- if (!file_util::PathExists(tmp_profile_))
- break;
- --num_retries;
- Sleep(kWaitForDeleteMs);
- }
- EXPECT_FALSE(file_util::PathExists(tmp_profile_));
+ EXPECT_TRUE(DieFileDie(tmp_profile_, true));
}
public: