Re-apply http://codereview.chromium.org/1622012

chrome/test/in_process_browser_test.h

Index: chrome/test/in_process_browser_test.h
diff --git a/chrome/test/in_process_browser_test.h b/chrome/test/in_process_browser_test.h
index 2b63b7fab8dca5970a0d837ed7d86f266a560204..63cad3b201301996e17ea6ad1552f29c9829af6c 100644
--- a/chrome/test/in_process_browser_test.h
+++ b/chrome/test/in_process_browser_test.h
@@ -56,10 +56,6 @@ class InProcessBrowserTest : public testing::Test {
   // Restores state configured in SetUp.
   virtual void TearDown();
 
-  // This method is used to decide if user data dir
-  // needs to be deleted or not.
-  virtual bool ShouldDeleteProfile() { return true; }
-
  protected:
   // Returns the browser created by CreateBrowser.
   Browser* browser() const { return browser_; }
@@ -67,6 +63,12 @@ class InProcessBrowserTest : public testing::Test {
   // Override this rather than TestBody.
   virtual void RunTestOnMainThread() = 0;
 
+  // Helper to initialize the user data directory.  Called by SetUp() after
+  // erasing the user data directory, but before any browser is launched.
+  // If a test wishes to set up some initial non-empty state in the user
+  // data directory before the browser starts up, it can do so here.
+  virtual void SetUpUserDataDirectory() {};
+
   // We need these special methods because InProcessBrowserTest::SetUp is the
   // bottom of the stack that winds up calling your test method, so it is not
   // always an option to do what you want by overriding it and calling the