Enable UserDataDir selection in InProcessBrowserTest

chrome/test/base/in_process_browser_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/in_process_browser_test.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
@@ skipping 69 matching lines @@
   test_server_.reset(new net::TestServer(
       net::TestServer::TYPE_HTTP,
       net::TestServer::kLocalhost,
       FilePath(FILE_PATH_LITERAL("chrome/test/data"))));
 }
 
 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)) {
     content::RenderProcessHost::set_run_renderer_in_process(true);
     single_process_renderer_client_.reset(
         new content::MockContentRendererClient);
     content::GetContentClient()->set_renderer(
         single_process_renderer_client_.get());
   }
 
@@ skipping 231 matching lines @@
   if (BrowserList::size() == 0)
     return;
 
   // Invoke CloseAllBrowsersAndMayExit on a running message loop.
   // CloseAllBrowsersAndMayExit exits the message loop after everything has been
   // shut down properly.
   MessageLoopForUI::current()->PostTask(FROM_HERE,
                                         base::Bind(&BrowserList::AttemptExit));
   ui_test_utils::RunMessageLoop();
 }