summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-17 17:35:51 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-17 17:35:51 +0000
commit52d69b88461a61effe21c4b62411ccd84285e3a0 (patch)
tree0c1ff3bc67ad1a19d63af2f4589bcacb6e465846 /chrome
parentdbb83f0b9be7bf572672d08ec6c8f66953efc59c (diff)
downloadchromium_src-52d69b88461a61effe21c4b62411ccd84285e3a0.zip
chromium_src-52d69b88461a61effe21c4b62411ccd84285e3a0.tar.gz
chromium_src-52d69b88461a61effe21c4b62411ccd84285e3a0.tar.bz2
Re-enable ProfileManagerTest.CreateAndUseTwoProfiles which was disabled due to
a Purify error (which we no longer use). BUG=10553 TEST=ProfileManagerTest.CreateAndUseTwoProfiles Patch by Xiaotian Chen <sargrass@google.com> Review URL: http://codereview.chromium.org/2803009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/profile_manager_unittest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/profile_manager_unittest.cc b/chrome/browser/profile_manager_unittest.cc
index 48fc179..ca8bf0b 100644
--- a/chrome/browser/profile_manager_unittest.cc
+++ b/chrome/browser/profile_manager_unittest.cc
@@ -114,9 +114,7 @@ TEST_F(ProfileManagerTest, LoggedInProfileDir) {
#endif
-// TODO(timsteele): This is disabled while I try to track down a purify
-// regression (http://crbug.com/10553).
-TEST_F(ProfileManagerTest, DISABLED_CreateAndUseTwoProfiles) {
+TEST_F(ProfileManagerTest, CreateAndUseTwoProfiles) {
FilePath source_path;
PathService::Get(chrome::DIR_TEST_DATA, &source_path);
source_path = source_path.Append(FILE_PATH_LITERAL("profiles"));