Admixtures in BrowserTestBase

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 9fa29b50bb5f13dfb6ebf174a34c40a021b82d40..43920bd1f5f1aa06b0391db58baa147ff16ebb3e 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -159,6 +159,14 @@ void InProcessBrowserTest::SetUp() {
   command_line->AppendSwitch(switches::kDisableOfflineAutoReload);
 
   // Allow subclasses to change the command line before running any tests.
+  ScopedVector<BrowserTestBase::Admixture> admixtures = GetAdmixtures();
+  for (ScopedVector<BrowserTestBase::Admixture>::iterator it =
+           admixtures.begin();
+       it != admixtures.end();
+       ++it) {
+    (*it)->SetUpCommandLine(command_line);
+  }
+
   SetUpCommandLine(command_line);
   // Add command line arguments that are used by all InProcessBrowserTests.
   PrepareTestCommandLine(command_line);
@@ -169,6 +177,14 @@ void InProcessBrowserTest::SetUp() {
 
   // Allow subclasses the opportunity to make changes to the default user data
   // dir before running any tests.
+  for (ScopedVector<BrowserTestBase::Admixture>::iterator it =
+           admixtures.begin();
+       it != admixtures.end();
+       ++it) {
+    ASSERT_TRUE((*it)->SetUpUserDataDirectory())
+        << "Could not set up user data directory.";
+  }
+  BrowserTestBase::ReturnAdmixtures(admixtures.Pass());
   ASSERT_TRUE(SetUpUserDataDirectory())
       << "Could not set up user data directory.";
 
@@ -419,6 +435,14 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
   // browser.
   content::RunAllPendingInMessageLoop();
 
+  ScopedVector<BrowserTestBase::Admixture> admixtures = GetAdmixtures();
+  for (ScopedVector<BrowserTestBase::Admixture>::iterator it =
+           admixtures.begin();
+       it != admixtures.end();
+       ++it) {
+    (*it)->SetUpInProcessBrowserTestFixture();
+  }
+  BrowserTestBase::ReturnAdmixtures(admixtures.Pass());
   SetUpOnMainThread();
 #if defined(OS_MACOSX)
   autorelease_pool_->Recycle();