Enable UserDataDir selection in InProcessBrowserTest

chrome/test/base/in_process_browser_test.cc

Index: chrome/test/base/in_process_browser_test.cc
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index 4ec9f221a44b926c13b7cac505cceef4eed8fde0..5e8f3fed226f2032d39dbd104390d47c9691619f 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -84,27 +84,27 @@ InProcessBrowserTest::~InProcessBrowserTest() {
 }
 
 void InProcessBrowserTest::SetUp() {
-  // Create a temporary user data directory if required.
-  ASSERT_TRUE(CreateUserDataDirectory())
-      << "Could not create user data directory.";
-
   // Undo TestingBrowserProcess creation in ChromeTestSuite.
   // TODO(phajdan.jr): Extract a smaller test suite so we don't need this.
   DCHECK(g_browser_process);
   delete g_browser_process;
   g_browser_process = NULL;
 
-  // Allow subclasses the opportunity to make changes to the default user data
-  // dir before running any tests.
-  ASSERT_TRUE(SetUpUserDataDirectory())
-      << "Could not set up user data directory.";
-
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   // Allow subclasses to change the command line before running any tests.
   SetUpCommandLine(command_line);
   // Add command line arguments that are used by all InProcessBrowserTests.
   PrepareTestCommandLine(command_line);
 
+  // Create a temporary user data directory if required.
+  ASSERT_TRUE(CreateUserDataDirectory())
+      << "Could not create user data directory.";
+
+  // Allow subclasses the opportunity to make changes to the default user data
+  // dir before running any tests.
+  ASSERT_TRUE(SetUpUserDataDirectory())
+      << "Could not set up user data directory.";
+
   // Single-process mode is not set in BrowserMain, so process it explicitly,
   // and set up renderer.
   if (command_line->HasSwitch(switches::kSingleProcess)) {