From 2c9bf9d7fc00e4d3a2b3655300156424127d4fc6 Mon Sep 17 00:00:00 2001 From: "tim@chromium.org" Date: Fri, 7 Aug 2009 00:43:49 +0000 Subject: Make user data dir deletion optional for InProcessBrowserTests. Original patch by tejasshah@google.com Original review: http://codereview.chromium.org/159896 TEST=any browser test or live sync test TBR=nick Review URL: http://codereview.chromium.org/164118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22705 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/in_process_browser_test.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'chrome/test/in_process_browser_test.cc') diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index 0815941..6c07e41 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -54,6 +54,9 @@ InProcessBrowserTest::InProcessBrowserTest() } void InProcessBrowserTest::SetUp() { + // This method does nothing in default case. But can be overridden + // to set user data dir for test. + SetUpUserDataDirForTest(); // Cleanup the user data dir. FilePath user_data_dir; PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); @@ -61,7 +64,8 @@ void InProcessBrowserTest::SetUp() { "The user data directory name passed into this test was too " "short to delete safely. Please check the user-data-dir " "argument and try again."; - ASSERT_TRUE(file_util::DieFileDie(user_data_dir, true)); + if (ShouldDeleteProfile()) + ASSERT_TRUE(file_util::DieFileDie(user_data_dir, true)); // The unit test suite creates a testingbrowser, but we want the real thing. // Delete the current one. We'll install the testing one in TearDown. -- cgit v1.1