| Index: content/test/browser_test_base.cc
|
| ===================================================================
|
| --- content/test/browser_test_base.cc (revision 150588)
|
| +++ content/test/browser_test_base.cc (working copy)
|
| @@ -15,6 +15,10 @@
|
| #include "base/system_monitor/system_monitor.h"
|
| #endif
|
|
|
| +#if defined(USE_AURA)
|
| +#include "ui/aura/test/aura_test_helper.h"
|
| +#endif
|
| +
|
| extern int BrowserMain(const content::MainFunctionParams&);
|
|
|
| BrowserTestBase::BrowserTestBase() {
|
| @@ -41,11 +45,18 @@
|
| base::Bind(&BrowserTestBase::ProxyRunTestOnMainThreadLoop, this));
|
|
|
| SetUpInProcessBrowserTestFixture();
|
| +#if defined(USE_AURA)
|
| + aura_test_helper_.reset(new aura::test::AuraTestHelper(&ui_loop_));
|
| + aura_test_helper_->SetUp();
|
| +#endif // USE_AURA
|
| BrowserMain(params);
|
| TearDownInProcessBrowserTestFixture();
|
| }
|
|
|
| void BrowserTestBase::TearDown() {
|
| +#if defined(USE_AURA)
|
| + aura_test_helper_->TearDown();
|
| +#endif
|
| }
|
|
|
| void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
|
|
|