Admixtures in BrowserTestBase

content/public/test/browser_test_base.cc

 // Copyright (c) 2011 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 "content/public/test/browser_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/i18n/icu_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_info.h"
 #include "base/test/test_timeouts.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/public/app/content_main.h"
-#include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/test/test_launcher.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/net_errors.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/gl/gl_implementation.h"
@@ skipping 124 matching lines @@
 BrowserTestBase::~BrowserTestBase() {
 #if defined(OS_ANDROID)
   // RemoteTestServer can cause wait on the UI thread.
   base::ThreadRestrictions::ScopedAllowWait allow_wait;
   test_server_.reset(NULL);
 #endif
 }
 
 void BrowserTestBase::SetUp() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-
   // Override the child process connection timeout since tests can exceed that
   // when sharded.
   command_line->AppendSwitchASCII(
       switches::kIPCConnectionTimeout,
       base::IntToString(TestTimeouts::action_max_timeout().InSeconds()));
 
   // The tests assume that file:// URIs can freely access other file:// URIs.
   command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
 
   command_line->AppendSwitch(switches::kDomAutomationController);
@@ skipping 59 matching lines @@
     command_line->AppendSwitch(switches::kOverrideUseGLWithOSMesaForTests);
 
   scoped_refptr<net::HostResolverProc> local_resolver =
       new LocalHostResolverProc();
   rule_based_resolver_ =
       new net::RuleBasedHostResolverProc(local_resolver.get());
   rule_based_resolver_->AddSimulatedFailure("wpad");
   net::ScopedDefaultHostResolverProc scoped_local_host_resolver_proc(
       rule_based_resolver_.get());
   SetUpInProcessBrowserTestFixture();
+  for (ScopedVector<Admixture>::iterator it = admixtures_.begin();

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

You call admixtures' SetUp* method after main test's SetUp* method here, but for
SetUpOnMainThread and SetUpCommandLine you do the opposite: first call test's
SetUp* then admixtures' SetUp*. Let's be consistent and choose one order of
calling SetUp*. I think the better one is first admixtures then test, because
test can use admixtures in its SetUp* somehow.

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

Done.

+       it != admixtures_.end();
+       ++it) {
+    (*it)->SetUpInProcessBrowserTestFixture();
+  }
 
   base::Closure* ui_task =
       new base::Closure(
           base::Bind(&BrowserTestBase::ProxyRunTestOnMainThreadLoop, this));
 
 #if defined(OS_ANDROID)
   MainFunctionParams params(*command_line);
   params.ui_task = ui_task;
   // TODO(phajdan.jr): Check return code, http://crbug.com/374738 .
   BrowserMain(params);
@@ skipping 46 matching lines @@
 void BrowserTestBase::UseSoftwareCompositing() {
   use_software_compositing_ = true;
 }
 
 bool BrowserTestBase::UsingOSMesa() const {
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   return cmd->GetSwitchValueASCII(switches::kUseGL) ==
          gfx::kGLImplementationOSMesaName;
 }
 
+void BrowserTestBase::AddAdmixture(BrowserTestBase::Admixture* admixture) {
+  admixtures_.push_back(admixture);
+}
+
+std::vector<BrowserTestBase::Admixture*> BrowserTestBase::GetAdmixtures() {
+  return admixtures_.get();
+}
+
 }  // namespace content