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..b98b5f1a9a55182cf8138caa175532b8e5dfca9f 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.
+  std::vector<BrowserTestBase::Admixture*> admixtures = GetAdmixtures();
+  for (std::vector<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);
@@ -419,6 +427,13 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
   // browser.
   content::RunAllPendingInMessageLoop();
 
+  std::vector<BrowserTestBase::Admixture*> admixtures = GetAdmixtures();
+  for (std::vector<BrowserTestBase::Admixture*>::iterator it =
+           admixtures.begin();
+       it != admixtures.end();
+       ++it) {
+    (*it)->SetUpInProcessBrowserTestFixture();

[dzhioev (left Google), 2014/08/18 12:11:46]

We should call SetUpOnMainThread here, not SetUpInProcessBrowserTestFixture.

[Lisa Ignatyeva, 2014/08/18 12:20:41]

Done.

+  }
   SetUpOnMainThread();
 #if defined(OS_MACOSX)
   autorelease_pool_->Recycle();