Admixtures in BrowserTestBase

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/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 141 matching lines @@
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   // Auto-reload breaks many browser tests, which assume error pages won't be
   // reloaded out from under them. Tests that expect or desire this behavior can
   // append switches::kEnableOfflineAutoReload, which will override the disable
   // here.
   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);
 
   // 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.
@@ skipping 240 matching lines @@
   // deallocation via an autorelease pool (such as browser window closure and
   // browser shutdown). To avoid this, the following pool is recycled after each
   // time code is directly executed.
   autorelease_pool_ = new base::mac::ScopedNSAutoreleasePool;
 #endif
 
   // Pump any pending events that were created as a result of creating a
   // 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();
 #endif
 
   if (!HasFatalFailure())
     RunTestOnMainThread();
 #if defined(OS_MACOSX)
   autorelease_pool_->Recycle();
 #endif
@@ skipping 41 matching lines @@
   // On the Mac, this eventually reaches
   // -[BrowserWindowController windowWillClose:], which will post a deferred
   // -autorelease on itself to ultimately destroy the Browser object. The line
   // below is necessary to pump these pending messages to ensure all Browsers
   // get deleted.
   content::RunAllPendingInMessageLoop();
   delete autorelease_pool_;
   autorelease_pool_ = NULL;
 #endif
 }